Add index of weapon types + singleton