Refactoring to meet new config.