updated with classmap