refactored DataObject and -Edtiro