Reworked items and inventory