Move custom-config builder into helper