Update config to 1.6 standards
Add explicit fields