More Config refactorings