Mapping validators are refactored