Use item_id in addition to handle