GearSwap - Update to enforce WS and MS types