Added weapon & ammo support