Added support for weapons