Data mapper was adapted