Added Mappers and Entity Interfaces