Updated ConfigBuilder