Added object_id into all needed methods