ValidateMap class recfactored