Vehicle and VehicleView are now separated