add classmap; refactoring