Update classmap properly