Some updates and added classmap