Build 1.0.16
- Removed individually set properties to reduce code