Added class-mapping information