Removed DataObjectAsPage dependancy.