Added weapon class, referenced it in living entity