More changes in configuration
A big update