diff --git a/doc/source/_exts/teamtable.py b/doc/source/_exts/teamtable.py
index 9ade57d..9d3615f 100644
--- a/doc/source/_exts/teamtable.py
+++ b/doc/source/_exts/teamtable.py
@@ -105,7 +105,14 @@ class TeamTable(Table):
             # Iterate over the headers in the same order every time.
             for h in self.HEADERS:
                 if h.lower() == "name":
-                    cell = "<p><a href=\"%s\">%s</a>" % (all_teams[team]['url'], team)
+                    cell = "<a href=\"%s\">%s</a>" % (all_teams[team]['url'], team)
+                    entry = nodes.entry()
+                    para = nodes.raw('', cell, format='html')
+                elif h.lower() == "chairs":
+                    chairs = []
+                    for chair in all_teams[team]['chairs']:
+                        chairs.append("%s<br />" % (chair['name']))
+                    cell = "".join(chairs)
                     entry = nodes.entry()
                     para = nodes.raw('', cell, format='html')
                 else:
diff --git a/reference/teams.yaml b/reference/teams.yaml
index 5043aa5..9945d1b 100644
--- a/reference/teams.yaml
+++ b/reference/teams.yaml
@@ -1,6 +1,19 @@
 Large Deployment Team:
-  chairs: Matt Van Winkle <vw@rackspace.com>
+  chairs:
+    - name: Matt Van Winkle
+      irc: VW
+      email: vw@rackspace.com
   mission: >
      To discuss the needs and issues of those running large OpenStack deployments.
   url: https://wiki.openstack.org/wiki/Large_Deployment_Team
-
+  status: active
+  aucs:
+    - name:
+      irc:
+      email:
+      expires-in:
+  extra-aucs:
+    - name:
+      email:
+      expires-in:
+      comment:
diff --git a/reference/working-groups.yaml b/reference/working-groups.yaml
index 680a01e..2095a3f 100644
--- a/reference/working-groups.yaml
+++ b/reference/working-groups.yaml
@@ -1,7 +1,22 @@
 AUC Recognition:
-  chairs: Shamail Tahir <itzshamail@gmail.com>, Maish Saidel-Keesing <maishsk@maishsk.com>
+  chairs:
+    - name: Shamail Tahir
+      irc: shamail
+      email: itzshamail@gmail.com
+    - name: Maish Saidel-Keesing
+      irc:
+      email: maishsk@maishsk.com
   mission: >
      To assist the User Committee with defining its constituency.
   url: https://wiki.openstack.org/wiki/AUCRecognition
   status: completed
-
+  aucs:
+    - name:
+      irc:
+      email:
+      expires-in:
+  extra-aucs:
+    - name:
+      email:
+      expires-in:
+      comment: