Fixed classmap generator bug and update classmap