Added weapon types