Completed class Mapper