diff --git a/index.html b/index.html
index f1166f1..1e47aae 100644
--- a/index.html
+++ b/index.html
@@ -253,7 +253,7 @@ <h3>Role Mapping Table</h3>
 								<th><abbr title="Accessibility Toolkit">ATK</abbr>/<abbr
 										title="Assistive Technology - Service Provider Interface">AT-SPI</abbr>
 									Role</th>
-								<th><abbr title="Mac OS X Accessibility Protocol">AXAPI</abbr></th>
+								<th><abbr title="Mac OS X Accessibility Protocol">Mac AX API</abbr></th>
 							</tr>
 						</thead>
 						<tbody>
@@ -273,8 +273,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-abstract</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent: <code>{ label: "type", value: "abstract" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-acknowledgments">
@@ -295,8 +300,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code><code>ROLE_LANDMARK</code></code> and object attribute
 											<code>xml-roles:doc-acknowledgments</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "acknowledgements" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-afterword">
@@ -318,8 +328,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-afterword</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "afterword" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-appendix">
@@ -341,8 +356,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-appendix</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "appendix" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-backlink">
@@ -366,8 +386,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LINK</code> and object attribute
 											<code>xml-roles:doc-backlink</code>. </p></td>
-								<td>AXRole: <code>AXLink</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'link'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXLink</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'link'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "back" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -387,8 +412,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LIST_ITEM</code> and object attribute
 											<code>xml-roles:doc-bilioentry</code>.</p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank b/c these are already contained by the 'bibliography' region -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-bibliography">
@@ -409,8 +439,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-bibliography</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "bibliography" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-biblioentry-implied">
@@ -429,8 +464,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LIST_ITEM</code> and object attribute
 											<code>xml-roles:doc-bilioentry</code>.</p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank b/c these are already contained by the 'bibliography' region -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-biblioref">
@@ -454,8 +494,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LINK</code> and object attribute
 											<code>xml-roles:doc-biblioref</code>. </p></td>
-								<td>AXRole: <code>AXLink</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'link'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXLink</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'link'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "bibliography" }</code></li>
+									</ul>
 								</td>
 							</tr>
 
@@ -476,8 +521,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:chapter</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkChapter</code></li>
+										<li>AXRoleDescription: <code>'chapter'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-colophon">
@@ -493,8 +543,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-colophon</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "colophon" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -516,8 +571,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-conclusion</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "conclusion" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-cover">
@@ -531,8 +591,13 @@ <h3>Role Mapping Table</h3>
 									<p>expose <code>ROLE_IMAGE</code> and object attribute
 											<code>xml-roles:doc-cover</code>. </p>
 								</td>
-								<td>AXRole: <code>AXImage</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'image'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXImage</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'cover image'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-credit">
@@ -547,8 +612,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-credit</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank b/c this is already contained by 'credits' -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-credits">
@@ -568,8 +638,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-credits</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "credits" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-dedication">
@@ -585,8 +660,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-dedication</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "dedication" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-endnote">
@@ -602,8 +682,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LIST_ITEM</code> and object attribute
 											<code>xml-roles:doc-endnote</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank b/c this is already contained by 'endnotes' -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-endnotes">
@@ -625,8 +710,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-endnotes</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "end notes" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-endnote-implied">
@@ -644,8 +734,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LIST_ITEM</code> and object attribute
 											<code>xml-roles:doc-endnote</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank b/c this is already contained by 'endnotes' -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-epigraph">
@@ -661,8 +756,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-epigraph</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "epigraph" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-epilogue">
@@ -683,8 +783,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-epilogue</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "epilog" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -705,8 +810,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-errata</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "errata" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-example">
@@ -721,8 +831,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-example</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "example" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-footnote">
@@ -742,8 +857,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_FOOTNOTE</code> and object attribute
 											<code>xml-roles:doc-footnote</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "footnote" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-foreword">
@@ -764,8 +884,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-foreword</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "foreword" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-glossary">
@@ -787,8 +912,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-glossary</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "glossary" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-glossref">
@@ -812,8 +942,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LINK</code> and object attribute
 											<code>xml-roles:doc-glossref</code>. </p></td>
-								<td>AXRole: <code>AXLink</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'link'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXLink</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'link'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "glossary" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -835,8 +970,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-index</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole:
-									<code>AXLandmarkNavigation</code><br /> AXRoleDescription: <code>'navigation'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkNavigation</code></li>
+										<li>AXRoleDescription: <code>'navigation'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "index" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-introduction">
@@ -858,8 +998,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-introduction</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "introduction" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -883,8 +1028,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LINK</code> and object attribute
 											<code>xml-roles:doc-noteref</code>. </p></td>
-								<td>AXRole: <code>AXLink</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'link'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXLink</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'link'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "note" }</code></li>
+									</ul>
 								</td>
 
 							</tr>
@@ -900,8 +1050,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_COMMENT</code> and object attribute
 											<code>xml-roles:doc-notice</code>.</p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXDocumentNote</code><br />
-									AXRoleDescription: <code>'note'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXDocumentNote</code></li>
+										<li>AXRoleDescription: <code>'note'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-pagebreak">
@@ -917,8 +1072,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SEPARATOR</code> and object attribute
 											<code>xml-roles:doc-pagebreak</code>. </p></td>
-								<td>AXRole: <code>AXSplitter</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'splitter'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXSplitter</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'splitter'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "page break" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-pagefooter">
@@ -939,7 +1099,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td>Expose <p><code>ROLE_FOOTER</code> and object attribute
 											<code>xml-roles:doc-pagefooter</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "footer" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-pageheader">
@@ -960,7 +1126,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td>Expose <p><code>ROLE_HEADER</code> and object attribute
 											<code>xml-roles:doc-pageheader</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>&lt;nil&gt;</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>&lt;nil&gt;</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "header" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-pagelist">
@@ -982,8 +1154,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td>Expose <p><code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-pagelist</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole:
-									<code>AXLandmarkNavigation</code><br /> AXRoleDescription: <code>'navigation'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkNavigation</code></li>
+										<li>AXRoleDescription: <code>'navigation'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "page list" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-part">
@@ -1004,8 +1181,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-part</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "part" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-preface">
@@ -1026,8 +1208,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-pagebreak</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "preface" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-prologue">
@@ -1049,8 +1236,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-prologue</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXLandmarkRegion</code><br />
-									AXRoleDescription: <code>'region'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkRegion</code></li>
+										<li>AXRoleDescription: <code>'region'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "prolog" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-pullquote">
@@ -1070,8 +1262,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-pullquote</code>.</p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "pull quote" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-qna">
@@ -1086,8 +1283,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_SECTION</code> and object attribute
 											<code>xml-roles:doc-qna</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXApplicationGroup</code><br />
-									AXRoleDescription: <code>'group'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXApplicationGroup</code></li>
+										<li>AXRoleDescription: <code>'group'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "Q&amp;A" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-subtitle">
@@ -1106,8 +1308,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_HEADING</code> and object attribute
 											<code>xml-roles:doc-subtitle</code>. </p></td>
-								<td>AXRole: <code>AXHeading</code><br /> AXSubrole: <code>&lt;nil&gt;</code><br />
-									AXRoleDescription: <code>'heading'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXHeading</code></li>
+										<li>AXSubrole: <code>AXSubtitle</code></li>
+										<li>AXRoleDescription: <code>'subtitle'</code></li>
+										<li>AXCustomContent:<code>{}</code></li><!-- intentionally blank -->
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-tip">
@@ -1123,8 +1330,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_COMMENT</code> and object attribute
 											<code>xml-roles:doc-tip</code>. </p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole: <code>AXDocumentNote</code><br />
-									AXRoleDescription: <code>'note'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXDocumentNote</code></li>
+										<li>AXRoleDescription: <code>'note'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "tip" }</code></li>
+									</ul>
 								</td>
 							</tr>
 							<tr id="role-map-toc">
@@ -1145,8 +1357,13 @@ <h3>Role Mapping Table</h3>
 								</td>
 								<td><p>Expose <code>ROLE_LANDMARK</code> and object attribute
 											<code>xml-roles:doc-toc</code>.</p></td>
-								<td>AXRole: <code>AXGroup</code><br /> AXSubrole:
-									<code>AXLandmarkNavigation</code><br /> AXRoleDescription: <code>'navigation'</code>
+								<td>
+									<ul>
+										<li>AXRole: <code>AXGroup</code></li>
+										<li>AXSubrole: <code>AXLandmarkNavigation</code></li>
+										<li>AXRoleDescription: <code>'navigation'</code></li>
+										<li>AXCustomContent:<code>{ label: "type", value: "table of contents" }</code></li>
+									</ul>
 								</td>
 							</tr>
 						</tbody>