diff --git a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml
index 0cce22df7..8c3acec10 100644
--- a/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml	
+++ b/topology/University of Chicago/MWT2 ATLAS UC/MWT2.yaml	
@@ -18,6 +18,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -31,6 +34,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: This is unified gatekeeper for MWT2 resources.
     FQDN: osg-gk.mwt2.org
     ID: 375
@@ -69,6 +75,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000013
@@ -82,6 +91,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description:
       MWT2-hosted resources for Connect-related submitters. Supporting
       OSG, XENON1T, OSG, ATLAS, CMS, etc via direct flocking.
@@ -102,27 +114,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 Gatekeeper located at Indiana University @ Indianapolis, IN
     FQDN: iut2-gk.mwt2.org
     ID: 470
@@ -153,27 +171,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 Gatekeeper located at Indiana University @ Indianapolis, IN
     FQDN: iut2-gk02.mwt2.org
     ID: 1295
@@ -212,6 +236,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -225,6 +252,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 Gatekeeper located at The University of Chicago @ Chicago, IL
     FQDN: uct2-gk.mwt2.org
     ID: 471
@@ -263,6 +293,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -276,6 +309,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 Gatekeeper located at The University of Chicago @ Chicago, IL
     FQDN: uct2-gk02.mwt2.org
     ID: 1299
@@ -314,6 +350,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -327,6 +366,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
     FQDN: uiuc-gk.mwt2.org
     ID: 490
@@ -365,6 +407,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -378,6 +423,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 Gatekeeper located at University of Illinois @ Urbana-Champaign, IL
     FQDN: uiuc-gk02.mwt2.org
     ID: 1432
@@ -416,6 +464,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -429,6 +480,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 CVMFS Squid located at University of Illinois @ Urbana-Champaign, IL
     FQDN: mwt2-cvmfs.campuscluster.illinois.edu
     ID: 914
@@ -453,6 +507,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -466,6 +523,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 SLATE located at the University of Chicago @ Chicago, IL
     FQDN: uct2-squid.mwt2.org
     ID: 1065
@@ -493,23 +553,12 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -523,6 +572,12 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 SLATE located at the University of Chicago @ Chicago, IL
     FQDN: sl-uc-xcache1.slateci.io
     ID: 1239
@@ -542,27 +597,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 SLATE located at Indiana University @ Indianapolis, IN
     FQDN: iut2-slate.mwt2.org
     ID: 1066
@@ -582,27 +643,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 SLATE located at Indiana University @ Indianapolis, IN
     FQDN: iut2-slate01.mwt2.org
     ID: 1241
@@ -630,6 +697,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -643,6 +713,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 SLATE located at University of Illinois @ Urbana-Champaign, IL
     FQDN: mwt2-slate.mwt2.org
     ID: 1067
@@ -668,8 +741,14 @@ Resources:
           ID: OSG1000064
           Name: Ilija Vukotic
         Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -681,8 +760,14 @@ Resources:
           ID: OSG1000064
           Name: Ilija Vukotic
         Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 SLATE Varnish cache located at University of Chicago, IL
     FQDN: v4a.mwt2.org
     ID: 1320
@@ -706,8 +791,14 @@ Resources:
           ID: OSG1000064
           Name: Ilija Vukotic
         Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -719,8 +810,14 @@ Resources:
           ID: OSG1000064
           Name: Ilija Vukotic
         Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 SLATE Varnish cache located at University of Chicago, IL
     FQDN: v4cvmfs.mwt2.org
     ID: 1321
@@ -745,6 +842,15 @@ Resources:
         Tertiary:
           ID: OSG1000064
           Name: Ilija Vukotic
+        Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
+          ID: OSG1000221
+          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -755,6 +861,15 @@ Resources:
         Tertiary:
           ID: OSG1000064
           Name: Ilija Vukotic
+        Tertiary 2:
+          ID: OSG1000765
+          Name: David Jordan
+        Tertiary 3:
+          ID: OSG1000221
+          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: Varnish cache located at Starlight, Chicago, IL
     FQDN: starlight.varnish.atlas-ml.org
     Services:
@@ -781,6 +896,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000013
@@ -794,6 +912,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 dCache/SRM frontend
     FQDN: uct2-dcache-head.mwt2.org
     FQDNAliases:
@@ -834,6 +955,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000013
@@ -847,6 +971,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: GridFTP headnode for MWT2
     FQDN: uct2-gridftp.mwt2.org
     ID: 1183
@@ -885,6 +1012,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000013
@@ -898,6 +1028,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: XRootD door/headnode for MWT2
     FQDN: fax.mwt2.org
     ID: 1184
@@ -936,6 +1069,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000013
@@ -949,6 +1085,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: HTTP-TPC WebDAV service for MWT2
     FQDN: webdav.mwt2.org
     ID: 1185
@@ -979,27 +1118,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 perfSONAR-PS Bandwidth instance at Indiana University
     FQDN: iut2-net2.iu.edu
     ID: 581
@@ -1018,27 +1163,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Testbed Perfsonar bandwidth node
     FQDN: iut2-net4.iu.edu
     ID: 672
@@ -1057,27 +1208,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Internal perfsonar bandwidth nodes
     FQDN: iut2-net6.iu.edu
     ID: 675
@@ -1096,27 +1253,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Internal perfsonar bandwidth nodes
     FQDN: iut2-net8.iu.edu
     ID: 676
@@ -1135,44 +1298,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Bandwidth instance at Indiana University (Replaces iut2-net2)
     FQDN: iut2-net10.iu.edu
     ID: 1223
@@ -1191,44 +1349,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Bandwidth instance at Indiana University (Replaces iut2-net4)
     FQDN: iut2-net12.iu.edu
     ID: 1235
@@ -1247,44 +1400,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Bandwidth instance at Indiana University (Replaces iut2-net6)
     FQDN: iut2-net14.iu.edu
     ID: 1231
@@ -1303,44 +1451,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Bandwidth instance at Indiana University (Replaces iut2-net8)
     FQDN: iut2-net16.iu.edu
     ID: 1233
@@ -1359,27 +1502,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: MWT2 perfSONAR-PS Latency instance at Indiana University
     FQDN: iut2-net1.iu.edu
     ID: 517
@@ -1398,27 +1547,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Testbed Perfsonar latency node
     FQDN: iut2-net3.iu.edu
     ID: 671
@@ -1437,27 +1592,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Campus perfsonar latency node
     FQDN: iut2-net5.iu.edu
     ID: 673
@@ -1476,27 +1637,33 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
       Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
     Description: Internal Perfsonar latency nodes
     FQDN: iut2-net7.iu.edu
     ID: 674
@@ -1515,44 +1682,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Latency instance at Indiana University (replaces iut2-net1)
     FQDN: iut2-net09.iu.edu
     ID: 1222
@@ -1571,44 +1733,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Latency instance at Indiana University (replaces iut2-net3)
     FQDN: iut2-net11.iu.edu
     ID: 1234
@@ -1627,44 +1784,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Latency instance at Indiana University (replaces iut2-net5)
     FQDN: iut2-net13.iu.edu
     ID: 1230
@@ -1683,44 +1835,39 @@ Resources:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Miscellaneous Contact:
-        Primary:
+        Tertiary 3:
+          ID: OSG1000013
+          Name: Lincoln Bryant
+        Tertiary 4:
           ID: 3b1876c30549a51501329cbb9678289fc786ac29
           Name: Frederick Luehring
-      Resource Report Contact:
+      Security Contact:
         Primary:
           ID: OSG1000016
           Name: Judith Stephen
         Secondary:
-          ID: OSG1000013
-          Name: Lincoln Bryant
+          ID: OSG1000694
+          Name: Aidan Rosberg
         Tertiary:
           ID: OSG1000765
           Name: David Jordan
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
-      Security Contact:
-        Primary:
-          ID: OSG1000016
-          Name: Judith Stephen
-        Secondary:
+        Tertiary 3:
           ID: OSG1000013
           Name: Lincoln Bryant
-        Tertiary:
-          ID: OSG1000765
-          Name: David Jordan
-        Tertiary 2:
-          ID: OSG1000221
-          Name: Farnaz Golnaraghi
+        Tertiary 4:
+          ID: 3b1876c30549a51501329cbb9678289fc786ac29
+          Name: Frederick Luehring
     Description: MWT2 perfSONAR-PS Latency instance at Indiana University (replaces iut2-net7)
     FQDN: iut2-net15.iu.edu
     ID: 1232
@@ -1747,6 +1894,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1760,6 +1910,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 perfSONAR-PS Bandwidth instance at the University of Chicago
     FQDN: uct2-net2.mwt2.org
     ID: 580
@@ -1786,6 +1939,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1799,6 +1955,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: Testbed Perfsonar Bandwidth node
     FQDN: uct2-net4.mwt2.org
     ID: 670
@@ -1825,6 +1984,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1838,6 +2000,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: MWT2 perfSONAR-PS Latency instance at the University of Chicago
     FQDN: uct2-net1.mwt2.org
     ID: 516
@@ -1864,6 +2029,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1877,6 +2045,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: Testbed PerfSonar Latency node
     FQDN: uct2-net3.mwt2.org
     ID: 669
@@ -1903,6 +2074,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1916,6 +2090,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description:
       MWT2 perfSONAR-PS Bandwidth instance at the University of Illinois
       at Urbana-Champaign
@@ -1944,6 +2121,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1957,6 +2137,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: Testbed Perfsonar Bandwidth node
     FQDN: mwt2-ps04.campuscluster.illinois.edu
     ID: 791
@@ -1983,6 +2166,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -1996,6 +2182,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description:
       MWT2 perfSONAR-PS Latency instance at the University of Illinois
       at Urbana-Champaign
@@ -2024,6 +2213,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
       Security Contact:
         Primary:
           ID: OSG1000016
@@ -2037,6 +2229,9 @@ Resources:
         Tertiary 2:
           ID: OSG1000221
           Name: Farnaz Golnaraghi
+        Tertiary 3:
+          ID: OSG1000694
+          Name: Aidan Rosberg
     Description: Testbed PerfSonar Latency node
     FQDN: mwt2-ps03.campuscluster.illinois.edu
     ID: 790