Improved usage of configuration.