missed out classmap in last commit