New config builder.
Improved.