replace all occurrences of workingSet by descriptiveDataSet and fix some other compile errors after model change