Added Weapon class