Removing data mappers (Decided to use provider plug in for that)