Modificated to classmap for presenter