Added support for different weapons