Fixed class map