Weapon & Pistol class added