Use updated isValidArmor