Modified based on VehicleCommonDataType