Rework how arrived items are handled