Rearranged the entire system for using weapons (modified version of Visitor pattern)