AbstractWeapon changes