Added itemType and weaponType to Weapon