Refactored configuration.