Added DataObject Catching to speed up Updates
Cleared Merge Conflicts