Updated class mapping