GearSwap - command_registry adjustments