UPDATE: Remove dependence on dataobjectset