Added index for object_id