Added weapon class