changed logic classmapLoader