Updated Data Objects to inherit from new DataFactory superclass.