Refactoring system configuration.