Updated weapon types