Added classmap to avoid the need to do that in the client app

@mymac80 @orchardit