Added the new classmap