Improve the configuration