Reworked Mapper class files