[#18] Mapper refactoring