Mapper class removed