ConfigBuilder/ConfigBuilderContext refactoring