Move validator to boot