Adding some classmap stuff