Changes for VehicleLifecycleHolder