Feature complete but with object_ids