Adding classmap fixed