Adding generic DataObject management.