Some minor to changes

 to allow automatic pick of combine classes and traditional dataset names in ws