Take advantage of the new split config system