Added Mapper for models