Changing to classmap