Added Mapper class