Update to new config format