Changed return types to Validator