Weapon class improved