Handle company and vehicle changes