Added Weapon and ActionObject classes