Added wrapper to build class map