Added the capacity to work with a default data set