Add Weapon class and improve Equipment