Added class map to resolve class name