GearSwap: Updates for the new API