Code sweeping
Added WeaponRegistry and IMCMessage support

for borderline cases