Still fixing Classmap