Changed vehicles to use metadata