Added weapon subclass