Added classmap support