Supporting new features

- supporting NonConsumables
- supporting EquippingModel
- fixed minor bugs