Move logic from VehicleController to RecordController