[Finishes #73789632] Better config handling