Refactoring for new system configuration