Changed data objects, added data factory