Removed DataObject class in favour of external iterator class