More work on config refactoring..