Replaced DataObject with PersistentObject