Reworked the design of ArmourCommands