Improve the previous patch with the loading of the configuration.