Updated classes for heavy weapons