Revert "Remove incomplete ConfigBuilder behavior"

This reverts commit d46d3b6657c2d2670fc58270133a3d51f07f3218.
Update ConfigBuilder models for current API