Added some fields for Wepaon