Added weapon support