switched to classmap