added class mapping