Added weapon classes