Updated classmap