Added requirement for data file and removed data set constant definitions
Changed names of data sets to those used in the data file