Start refactoring around configuration