Add support for weapon/armour level and type