Refactoring for modular configuration