Adding classmap back