Starting to refactor code to have dataSet support