Data Mapper was adapted