Improved Content-Area + Fixed a Bug in DataObject