Mapper refactored branch