Fixed the class definitions for vehicle.