Moved the required labels and grouping to yaml file and changed the regressor and computeTrainingData accordingly.