Work on DataSetExt redesign