Made some minor changes to the data mappers components