More refactoring for the new weapon system