More configuration builder work.