enhanced validator