Armor and Weapon mapping added.