Resources changes (GearSwap)

Minor changes to how items are handled to reduce memory overhead.