More work towards a ConfigBuilder