Update to proper TrainCV interface