Refactor: add item id after success aftercall