More refactoring to configuration