DataSet global refactoring