Added more fields to weapon