Move package validator behind FAI