Mapping validators refactoring