Added Mapper convenience class