Refactoring using Datasetinfo