Improved the class weapon handling