Revamped the Weapon classes