Weapon is no longer a template class