Updated class map