Added classmap
Merged the github change with my local one