diff --git a/tools/regression/geom/Test/T000/ref.conf b/tools/regression/geom/Test/T000/ref.conf
index 069c69832543..37df706f0378 100644
--- a/tools/regression/geom/Test/T000/ref.conf
+++ b/tools/regression/geom/Test/T000/ref.conf
@@ -1,23 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x805ba60</ref>
+  <class id="0x805bf20">
     <name>DEV-class</name>
   </class>
-  <class>
-    <ref>0x805b9a0</ref>
+  <class id="0x805bf00">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x805ba40</ref>
+  <class id="0x805bee0">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x805ba80</ref>
+  <class id="0x805bf40">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x805b980</ref>
+  <class id="0x805be40">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T001/ref.conf b/tools/regression/geom/Test/T001/ref.conf
index 8760176fe853..3cc22450d466 100644
--- a/tools/regression/geom/Test/T001/ref.conf
+++ b/tools/regression/geom/Test/T001/ref.conf
@@ -1,196 +1,162 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072460</ref>
+  <class id="0x8073560">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80c0c00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1c80">
+      <class ref="0x8073560"/>
       <name>ad0s3d</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8480</ref>
-	  <geom><ref>0x80c0c00</ref></geom>
-	  <provider><ref>0x80c0080</ref></provider>
+	<consumer id="0x80b9440">
+	  <geom ref="0x80c1c80"/>
+	  <provider ref="0x80c1100"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0a80</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1b00">
+      <class ref="0x8073560"/>
       <name>ad0s3c</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8440</ref>
-	  <geom><ref>0x80c0a80</ref></geom>
-	  <provider><ref>0x80c0000</ref></provider>
+	<consumer id="0x80b9400">
+	  <geom ref="0x80c1b00"/>
+	  <provider ref="0x80c1080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0900</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1980">
+      <class ref="0x8073560"/>
       <name>ad0s3a</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8400</ref>
-	  <geom><ref>0x80c0900</ref></geom>
-	  <provider><ref>0x80bcf80</ref></provider>
+	<consumer id="0x80b93c0">
+	  <geom ref="0x80c1980"/>
+	  <provider ref="0x80c1000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0780</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1800">
+      <class ref="0x8073560"/>
       <name>ad0s2c</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b83c0</ref>
-	  <geom><ref>0x80c0780</ref></geom>
-	  <provider><ref>0x80bcc80</ref></provider>
+	<consumer id="0x80b9380">
+	  <geom ref="0x80c1800"/>
+	  <provider ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0600</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1680">
+      <class ref="0x8073560"/>
       <name>ad0s1f</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8380</ref>
-	  <geom><ref>0x80c0600</ref></geom>
-	  <provider><ref>0x80bc980</ref></provider>
+	<consumer id="0x80b9340">
+	  <geom ref="0x80c1680"/>
+	  <provider ref="0x80bba00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1500">
+      <class ref="0x8073560"/>
       <name>ad0s1e</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8340</ref>
-	  <geom><ref>0x80c0480</ref></geom>
-	  <provider><ref>0x80bc900</ref></provider>
+	<consumer id="0x80b9300">
+	  <geom ref="0x80c1500"/>
+	  <provider ref="0x80bb980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0300</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1380">
+      <class ref="0x8073560"/>
       <name>ad0s1c</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80c0300</ref></geom>
-	  <provider><ref>0x80bc880</ref></provider>
+	<consumer id="0x80b92c0">
+	  <geom ref="0x80c1380"/>
+	  <provider ref="0x80bb900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0180</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1200">
+      <class ref="0x8073560"/>
       <name>ad0s1b</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80c0180</ref></geom>
-	  <provider><ref>0x80bc800</ref></provider>
+	<consumer id="0x80b9280">
+	  <geom ref="0x80c1200"/>
+	  <provider ref="0x80bb880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0100</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1180">
+      <class ref="0x8073560"/>
       <name>ad0s1a</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80c0100</ref></geom>
-	  <provider><ref>0x80bc780</ref></provider>
+	<consumer id="0x80b9240">
+	  <geom ref="0x80c1180"/>
+	  <provider ref="0x80bb800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bcd00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bbd80">
+      <class ref="0x8073560"/>
       <name>ad0s3</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80bcd00</ref></geom>
-	  <provider><ref>0x80bc400</ref></provider>
+	<consumer id="0x80b91c0">
+	  <geom ref="0x80bbd80"/>
+	  <provider ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bca00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bba80">
+      <class ref="0x8073560"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80bca00</ref></geom>
-	  <provider><ref>0x80bc380</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80bba80"/>
+	  <provider ref="0x80bb400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bc480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bb500">
+      <class ref="0x8073560"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80bc480</ref></geom>
-	  <provider><ref>0x80bc300</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bb500"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bc080</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bb100">
+      <class ref="0x8073560"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80bc080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bb100"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807243c</ref>
+  <class id="0x8073540">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072420</ref>
+  <class id="0x8073520">
     <name>MBR-class</name>
-    <geom>
-      <ref>0x80bc100</ref>
-      <class><ref>0x8072420</ref></class>
+    <geom id="0x80bb180">
+      <class ref="0x8073520"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80bc100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80bb180"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bc400</ref>
-	  <geom><ref>0x80bc100</ref></geom>
+	<provider id="0x80bb480">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>2</index>
 	    <length>8585256960</length>
 	    <seclength>16768080</seclength>
@@ -199,13 +165,11 @@
 	    <type>165</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc380</ref>
-	  <geom><ref>0x80bc100</ref></geom>
+	<provider id="0x80bb400">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>1</index>
 	    <length>5364817920</length>
 	    <seclength>10478160</seclength>
@@ -214,13 +178,11 @@
 	    <type>165</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc300</ref>
-	  <geom><ref>0x80bc100</ref></geom>
+	<provider id="0x80bb380">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>0</index>
 	    <length>3220406784</length>
 	    <seclength>6289857</seclength>
@@ -231,33 +193,28 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807247c</ref>
+  <class id="0x8073580">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80bcd80</ref>
-      <class><ref>0x807247c</ref></class>
+    <geom id="0x80bbe00">
+      <class ref="0x8073580"/>
       <name>ad0s3</name>
       <rank>3</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80bcd80</ref></geom>
-	  <provider><ref>0x80bc400</ref></provider>
+	<consumer id="0x80b9200">
+	  <geom ref="0x80bbe00"/>
+	  <provider ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80c0080</ref>
-	  <geom><ref>0x80bcd80</ref></geom>
+	<provider id="0x80c1100">
+	  <geom ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3d</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>3</index>
 	    <length>6488104960</length>
 	    <seclength>12672080</seclength>
@@ -265,13 +222,11 @@
 	    <secoffset>4096000</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0000</ref>
-	  <geom><ref>0x80bcd80</ref></geom>
+	<provider id="0x80c1080">
+	  <geom ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>8585256960</length>
 	    <seclength>16768080</seclength>
@@ -279,13 +234,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bcf80</ref>
-	  <geom><ref>0x80bcd80</ref></geom>
+	<provider id="0x80c1000">
+	  <geom ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s3a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>2097152000</length>
 	    <seclength>4096000</seclength>
@@ -294,30 +247,26 @@
 	  </config>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80bca80</ref>
-      <class><ref>0x807247c</ref></class>
+    <geom id="0x80bbb00">
+      <class ref="0x8073580"/>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80bca80</ref></geom>
-	  <provider><ref>0x80bc380</ref></provider>
+	<consumer id="0x80b9180">
+	  <geom ref="0x80bbb00"/>
+	  <provider ref="0x80bb400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bcc80</ref>
-	  <geom><ref>0x80bca80</ref></geom>
+	<provider id="0x80bbd00">
+	  <geom ref="0x80bbb00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>5364817920</length>
 	    <seclength>10478160</seclength>
@@ -326,30 +275,26 @@
 	  </config>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80bc500</ref>
-      <class><ref>0x807247c</ref></class>
+    <geom id="0x80bb580">
+      <class ref="0x8073580"/>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80bc500</ref></geom>
-	  <provider><ref>0x80bc300</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80bb580"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bc980</ref>
-	  <geom><ref>0x80bc500</ref></geom>
+	<provider id="0x80bba00">
+	  <geom ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>5</index>
 	    <length>2066973184</length>
 	    <seclength>4037057</seclength>
@@ -357,13 +302,11 @@
 	    <secoffset>2252800</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc900</ref>
-	  <geom><ref>0x80bc500</ref></geom>
+	<provider id="0x80bb980">
+	  <geom ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>4</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
@@ -371,13 +314,11 @@
 	    <secoffset>1228800</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc880</ref>
-	  <geom><ref>0x80bc500</ref></geom>
+	<provider id="0x80bb900">
+	  <geom ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>3220406784</length>
 	    <seclength>6289857</seclength>
@@ -385,13 +326,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc800</ref>
-	  <geom><ref>0x80bc500</ref></geom>
+	<provider id="0x80bb880">
+	  <geom ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
@@ -399,13 +338,11 @@
 	    <secoffset>204800</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc780</ref>
-	  <geom><ref>0x80bc500</ref></geom>
+	<provider id="0x80bb800">
+	  <geom ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>104857600</length>
 	    <seclength>204800</seclength>
@@ -415,17 +352,14 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807236c</ref>
+  <class id="0x8073480">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80bc000</ref>
-      <class><ref>0x807236c</ref></class>
+    <geom id="0x80bb000">
+      <class ref="0x8073480"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80bc000</ref></geom>
+	<provider id="0x80bb080">
+	  <geom ref="0x80bb000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T002/ref.conf b/tools/regression/geom/Test/T002/ref.conf
index bfecc43ee19a..7c7b63aaed08 100644
--- a/tools/regression/geom/Test/T002/ref.conf
+++ b/tools/regression/geom/Test/T002/ref.conf
@@ -1,76 +1,62 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072460</ref>
+  <class id="0x8073560">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80b9480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba500">
+      <class ref="0x8073560"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80b9480</ref></geom>
-	  <provider><ref>0x80b9380</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80ba500"/>
+	  <provider ref="0x80ba400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9400</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba480">
+      <class ref="0x8073560"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80b9400</ref></geom>
-	  <provider><ref>0x80b9300</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80ba480"/>
+	  <provider ref="0x80ba380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9080</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba100">
+      <class ref="0x8073560"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80b9080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80ba100"/>
+	  <provider ref="0x80ba080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807243c</ref>
+  <class id="0x8073540">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072420</ref>
+  <class id="0x8073520">
     <name>MBR-class</name>
-    <geom>
-      <ref>0x80b9100</ref>
-      <class><ref>0x8072420</ref></class>
+    <geom id="0x80ba180">
+      <class ref="0x8073520"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80b9100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80ba180"/>
+	  <provider ref="0x80ba080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9380</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80ba400">
+	  <geom ref="0x80ba180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>1</index>
 	    <length>4564740096</length>
 	    <seclength>8915508</seclength>
@@ -79,13 +65,11 @@
 	    <type>11</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9300</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80ba380">
+	  <geom ref="0x80ba180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>0</index>
 	    <length>296821760</length>
 	    <seclength>579730</seclength>
@@ -96,21 +80,17 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807247c</ref>
+  <class id="0x8073580">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x807236c</ref>
+  <class id="0x8073480">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80b9000</ref>
-      <class><ref>0x807236c</ref></class>
+    <geom id="0x80ba000">
+      <class ref="0x8073480"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80b9000</ref></geom>
+	<provider id="0x80ba080">
+	  <geom ref="0x80ba000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T003/ref.conf b/tools/regression/geom/Test/T003/ref.conf
index 9d7c21aae747..cdc8d6eba7b0 100644
--- a/tools/regression/geom/Test/T003/ref.conf
+++ b/tools/regression/geom/Test/T003/ref.conf
@@ -1,348 +1,289 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072460</ref>
+  <class id="0x8073560">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80ca480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80cb500">
+      <class ref="0x8073560"/>
       <name>ad0s27</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8740</ref>
-	  <geom><ref>0x80ca480</ref></geom>
-	  <provider><ref>0x80c3300</ref></provider>
+	<consumer id="0x80b9700">
+	  <geom ref="0x80cb500"/>
+	  <provider ref="0x80be380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80ca300</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80cb380">
+      <class ref="0x8073560"/>
       <name>ad0s26</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8700</ref>
-	  <geom><ref>0x80ca300</ref></geom>
-	  <provider><ref>0x80c3280</ref></provider>
+	<consumer id="0x80b96c0">
+	  <geom ref="0x80cb380"/>
+	  <provider ref="0x80be300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80ca180</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80cb200">
+      <class ref="0x8073560"/>
       <name>ad0s25</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b86c0</ref>
-	  <geom><ref>0x80ca180</ref></geom>
-	  <provider><ref>0x80c3200</ref></provider>
+	<consumer id="0x80b9680">
+	  <geom ref="0x80cb200"/>
+	  <provider ref="0x80be280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80ca000</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80cb080">
+      <class ref="0x8073560"/>
       <name>ad0s24</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8680</ref>
-	  <geom><ref>0x80ca000</ref></geom>
-	  <provider><ref>0x80c3180</ref></provider>
+	<consumer id="0x80b9640">
+	  <geom ref="0x80cb080"/>
+	  <provider ref="0x80be200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5e80</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1f00">
+      <class ref="0x8073560"/>
       <name>ad0s23</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8640</ref>
-	  <geom><ref>0x80c5e80</ref></geom>
-	  <provider><ref>0x80c3100</ref></provider>
+	<consumer id="0x80b9600">
+	  <geom ref="0x80c1f00"/>
+	  <provider ref="0x80be180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5d00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1d80">
+      <class ref="0x8073560"/>
       <name>ad0s22</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8600</ref>
-	  <geom><ref>0x80c5d00</ref></geom>
-	  <provider><ref>0x80c3080</ref></provider>
+	<consumer id="0x80b95c0">
+	  <geom ref="0x80c1d80"/>
+	  <provider ref="0x80be100"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5b80</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1c00">
+      <class ref="0x8073560"/>
       <name>ad0s21</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b85c0</ref>
-	  <geom><ref>0x80c5b80</ref></geom>
-	  <provider><ref>0x80c3000</ref></provider>
+	<consumer id="0x80b9580">
+	  <geom ref="0x80c1c00"/>
+	  <provider ref="0x80be080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5a00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1a80">
+      <class ref="0x8073560"/>
       <name>ad0s20</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8580</ref>
-	  <geom><ref>0x80c5a00</ref></geom>
-	  <provider><ref>0x80c0f80</ref></provider>
+	<consumer id="0x80b9540">
+	  <geom ref="0x80c1a80"/>
+	  <provider ref="0x80be000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5880</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1900">
+      <class ref="0x8073560"/>
       <name>ad0s19</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8540</ref>
-	  <geom><ref>0x80c5880</ref></geom>
-	  <provider><ref>0x80c0f00</ref></provider>
+	<consumer id="0x80b9500">
+	  <geom ref="0x80c1900"/>
+	  <provider ref="0x80bbf80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5700</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1780">
+      <class ref="0x8073560"/>
       <name>ad0s18</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8500</ref>
-	  <geom><ref>0x80c5700</ref></geom>
-	  <provider><ref>0x80c0e80</ref></provider>
+	<consumer id="0x80b94c0">
+	  <geom ref="0x80c1780"/>
+	  <provider ref="0x80bbf00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5580</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1600">
+      <class ref="0x8073560"/>
       <name>ad0s17</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b84c0</ref>
-	  <geom><ref>0x80c5580</ref></geom>
-	  <provider><ref>0x80c0e00</ref></provider>
+	<consumer id="0x80b9480">
+	  <geom ref="0x80c1600"/>
+	  <provider ref="0x80bbe80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5400</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1480">
+      <class ref="0x8073560"/>
       <name>ad0s16</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8480</ref>
-	  <geom><ref>0x80c5400</ref></geom>
-	  <provider><ref>0x80c0d80</ref></provider>
+	<consumer id="0x80b9440">
+	  <geom ref="0x80c1480"/>
+	  <provider ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5280</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1300">
+      <class ref="0x8073560"/>
       <name>ad0s15</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8440</ref>
-	  <geom><ref>0x80c5280</ref></geom>
-	  <provider><ref>0x80c0d00</ref></provider>
+	<consumer id="0x80b9400">
+	  <geom ref="0x80c1300"/>
+	  <provider ref="0x80bbd80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c5100</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1180">
+      <class ref="0x8073560"/>
       <name>ad0s14</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8400</ref>
-	  <geom><ref>0x80c5100</ref></geom>
-	  <provider><ref>0x80c0c80</ref></provider>
+	<consumer id="0x80b93c0">
+	  <geom ref="0x80c1180"/>
+	  <provider ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3f80</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80c1000">
+      <class ref="0x8073560"/>
       <name>ad0s13</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b83c0</ref>
-	  <geom><ref>0x80c3f80</ref></geom>
-	  <provider><ref>0x80c0c00</ref></provider>
+	<consumer id="0x80b9380">
+	  <geom ref="0x80c1000"/>
+	  <provider ref="0x80bbc80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3e00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bee80">
+      <class ref="0x8073560"/>
       <name>ad0s12</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8380</ref>
-	  <geom><ref>0x80c3e00</ref></geom>
-	  <provider><ref>0x80c0b80</ref></provider>
+	<consumer id="0x80b9340">
+	  <geom ref="0x80bee80"/>
+	  <provider ref="0x80bbc00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3c80</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bed00">
+      <class ref="0x8073560"/>
       <name>ad0s11</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8340</ref>
-	  <geom><ref>0x80c3c80</ref></geom>
-	  <provider><ref>0x80c0b00</ref></provider>
+	<consumer id="0x80b9300">
+	  <geom ref="0x80bed00"/>
+	  <provider ref="0x80bbb80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3b00</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80beb80">
+      <class ref="0x8073560"/>
       <name>ad0s10</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80c3b00</ref></geom>
-	  <provider><ref>0x80c0a80</ref></provider>
+	<consumer id="0x80b92c0">
+	  <geom ref="0x80beb80"/>
+	  <provider ref="0x80bbb00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3980</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bea00">
+      <class ref="0x8073560"/>
       <name>ad0s9</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80c3980</ref></geom>
-	  <provider><ref>0x80c0a00</ref></provider>
+	<consumer id="0x80b9280">
+	  <geom ref="0x80bea00"/>
+	  <provider ref="0x80bba80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3800</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80be880">
+      <class ref="0x8073560"/>
       <name>ad0s8</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80c3800</ref></geom>
-	  <provider><ref>0x80c0980</ref></provider>
+	<consumer id="0x80b9240">
+	  <geom ref="0x80be880"/>
+	  <provider ref="0x80bba00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3680</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80be700">
+      <class ref="0x8073560"/>
       <name>ad0s7</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80c3680</ref></geom>
-	  <provider><ref>0x80c0900</ref></provider>
+	<consumer id="0x80b9200">
+	  <geom ref="0x80be700"/>
+	  <provider ref="0x80bb980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3500</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80be580">
+      <class ref="0x8073560"/>
       <name>ad0s6</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80c3500</ref></geom>
-	  <provider><ref>0x80c0880</ref></provider>
+	<consumer id="0x80b91c0">
+	  <geom ref="0x80be580"/>
+	  <provider ref="0x80bb900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c3380</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80be400">
+      <class ref="0x8073560"/>
       <name>ad0s5</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80c3380</ref></geom>
-	  <provider><ref>0x80c0800</ref></provider>
+	<consumer id="0x80b9180">
+	  <geom ref="0x80be400"/>
+	  <provider ref="0x80bb880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bb500">
+      <class ref="0x8073560"/>
       <name>ad0s2</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80c0480</ref></geom>
-	  <provider><ref>0x80c0380</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80bb500"/>
+	  <provider ref="0x80bb400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0400</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bb480">
+      <class ref="0x8073560"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80c0400</ref></geom>
-	  <provider><ref>0x80c0300</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bb480"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c0080</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80bb100">
+      <class ref="0x8073560"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80c0080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bb100"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807243c</ref>
+  <class id="0x8073540">
     <name>MBREXT-class</name>
-    <geom>
-      <ref>0x80c0680</ref>
-      <class><ref>0x807243c</ref></class>
+    <geom id="0x80bb700">
+      <class ref="0x8073540"/>
       <name>ad0s2</name>
       <rank>3</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80c0680</ref></geom>
-	  <provider><ref>0x80c0380</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80bb700"/>
+	  <provider ref="0x80bb400"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80c3300</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be380">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s27</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>22</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -351,13 +292,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3280</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be300">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s26</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>21</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -366,13 +305,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3200</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be280">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s25</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>20</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -381,13 +318,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3180</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be200">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s24</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>19</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -396,13 +331,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3100</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be180">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s23</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>18</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -411,13 +344,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3080</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be100">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s22</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>17</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -426,13 +357,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c3000</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be080">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s21</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>16</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -441,13 +370,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0f80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80be000">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s20</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>15</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -456,13 +383,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0f00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbf80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s19</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>14</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -471,13 +396,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0e80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbf00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s18</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>13</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -486,13 +409,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0e00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbe80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s17</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>12</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -501,13 +422,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0d80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbe00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s16</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>11</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -516,13 +435,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0d00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbd80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s15</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>10</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -531,13 +448,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0c80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbd00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s14</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>9</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -546,13 +461,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0c00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbc80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s13</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>8</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -561,13 +474,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0b80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbc00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s12</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>7</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -576,13 +487,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0b00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbb80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s11</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>6</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -591,13 +500,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0a80</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bbb00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s10</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>5</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -606,13 +513,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0a00</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bba80">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s9</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>4</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -621,13 +526,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0980</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bba00">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s8</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>3</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -636,13 +539,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0900</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bb980">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s7</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>2</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -651,13 +552,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0880</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bb900">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s6</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>1</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -666,13 +565,11 @@
 	    <type>1</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0800</ref>
-	  <geom><ref>0x80c0680</ref></geom>
+	<provider id="0x80bb880">
+	  <geom ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s5</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>0</index>
 	    <length>8193024</length>
 	    <seclength>16002</seclength>
@@ -683,33 +580,27 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x8072420</ref>
+  <class id="0x8073520">
     <name>MBR-class</name>
-    <geom>
-      <ref>0x80c0100</ref>
-      <class><ref>0x8072420</ref></class>
+    <geom id="0x80bb180">
+      <class ref="0x8073520"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80c0100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80bb180"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80c0380</ref>
-	  <geom><ref>0x80c0100</ref></geom>
+	<provider id="0x80bb400">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s2</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>1</index>
 	    <length>427714560</length>
 	    <seclength>835380</seclength>
@@ -718,13 +609,11 @@
 	    <type>5</type>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80c0300</ref>
-	  <geom><ref>0x80c0100</ref></geom>
+	<provider id="0x80bb380">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>0</index>
 	    <length>2146765824</length>
 	    <seclength>4192902</seclength>
@@ -735,21 +624,17 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807247c</ref>
+  <class id="0x8073580">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x807236c</ref>
+  <class id="0x8073480">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80c0000</ref>
-      <class><ref>0x807236c</ref></class>
+    <geom id="0x80bb000">
+      <class ref="0x8073480"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80c0000</ref></geom>
+	<provider id="0x80bb080">
+	  <geom ref="0x80bb000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T004/ref.conf b/tools/regression/geom/Test/T004/ref.conf
index c482baa273f7..8658edfff3b1 100644
--- a/tools/regression/geom/Test/T004/ref.conf
+++ b/tools/regression/geom/Test/T004/ref.conf
@@ -1,160 +1,132 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072480</ref>
+  <class id="0x8073580">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80bd400</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bd480">
+      <class ref="0x8073580"/>
       <name>ad0s1h</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8340</ref>
-	  <geom><ref>0x80bd400</ref></geom>
-	  <provider><ref>0x80bca00</ref></provider>
+	<consumer id="0x80b9300">
+	  <geom ref="0x80bd480"/>
+	  <provider ref="0x80bba80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd280</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bd300">
+      <class ref="0x8073580"/>
       <name>ad0s1g</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80bd280</ref></geom>
-	  <provider><ref>0x80bc980</ref></provider>
+	<consumer id="0x80b92c0">
+	  <geom ref="0x80bd300"/>
+	  <provider ref="0x80bba00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd100</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bd180">
+      <class ref="0x8073580"/>
       <name>ad0s1f</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80bd100</ref></geom>
-	  <provider><ref>0x80bc900</ref></provider>
+	<consumer id="0x80b9280">
+	  <geom ref="0x80bd180"/>
+	  <provider ref="0x80bb980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bcf80</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bd000">
+      <class ref="0x8073580"/>
       <name>ad0s1e</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80bcf80</ref></geom>
-	  <provider><ref>0x80bc880</ref></provider>
+	<consumer id="0x80b9240">
+	  <geom ref="0x80bd000"/>
+	  <provider ref="0x80bb900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bce00</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bbe80">
+      <class ref="0x8073580"/>
       <name>ad0s1d</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80bce00</ref></geom>
-	  <provider><ref>0x80bc800</ref></provider>
+	<consumer id="0x80b9200">
+	  <geom ref="0x80bbe80"/>
+	  <provider ref="0x80bb880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bcc80</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bbd00">
+      <class ref="0x8073580"/>
       <name>ad0s1c</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80bcc80</ref></geom>
-	  <provider><ref>0x80bc780</ref></provider>
+	<consumer id="0x80b91c0">
+	  <geom ref="0x80bbd00"/>
+	  <provider ref="0x80bb800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bcb00</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bbb80">
+      <class ref="0x8073580"/>
       <name>ad0s1b</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80bcb00</ref></geom>
-	  <provider><ref>0x80bc700</ref></provider>
+	<consumer id="0x80b9180">
+	  <geom ref="0x80bbb80"/>
+	  <provider ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bca80</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bbb00">
+      <class ref="0x8073580"/>
       <name>ad0s1a</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80bca80</ref></geom>
-	  <provider><ref>0x80bc680</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80bbb00"/>
+	  <provider ref="0x80bb700"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bc380</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bb400">
+      <class ref="0x8073580"/>
       <name>ad0s1</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80bc380</ref></geom>
-	  <provider><ref>0x80bc300</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bb400"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bc080</ref>
-      <class><ref>0x8072480</ref></class>
+    <geom id="0x80bb100">
+      <class ref="0x8073580"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80bc080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bb100"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807245c</ref>
+  <class id="0x8073560">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072440</ref>
+  <class id="0x8073540">
     <name>MBR-class</name>
-    <geom>
-      <ref>0x80bc100</ref>
-      <class><ref>0x8072440</ref></class>
+    <geom id="0x80bb180">
+      <class ref="0x8073540"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80bc100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80bb180"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bc300</ref>
-	  <geom><ref>0x80bc100</ref></geom>
+	<provider id="0x80bb380">
+	  <geom ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1</name>
 	  <config>
-	    <frontstuff>0</frontstuff>
 	    <index>0</index>
 	    <length>20003848704</length>
 	    <seclength>39070017</seclength>
@@ -165,33 +137,28 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807249c</ref>
+  <class id="0x80735a0">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80bc400</ref>
-      <class><ref>0x807249c</ref></class>
+    <geom id="0x80bb480">
+      <class ref="0x80735a0"/>
       <name>ad0s1</name>
       <rank>3</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80bc400</ref></geom>
-	  <provider><ref>0x80bc300</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80bb480"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bca00</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bba80">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1h</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>7</index>
 	    <length>5368709120</length>
 	    <seclength>10485760</seclength>
@@ -199,13 +166,11 @@
 	    <secoffset>19898368</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc980</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bba00">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1g</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>6</index>
 	    <length>3221225472</length>
 	    <seclength>6291456</seclength>
@@ -213,13 +178,11 @@
 	    <secoffset>13606912</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc900</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb980">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1f</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>5</index>
 	    <length>4294967296</length>
 	    <seclength>8388608</seclength>
@@ -227,13 +190,11 @@
 	    <secoffset>5218304</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc880</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb900">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1e</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>4</index>
 	    <length>524288000</length>
 	    <seclength>1024000</seclength>
@@ -241,13 +202,11 @@
 	    <secoffset>4194304</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc800</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb880">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1d</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>3</index>
 	    <length>4447175168</length>
 	    <seclength>8685889</seclength>
@@ -255,13 +214,11 @@
 	    <secoffset>30384128</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc780</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb800">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>20003848704</length>
 	    <seclength>39070017</seclength>
@@ -269,13 +226,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc700</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb780">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>1073741824</length>
 	    <seclength>2097152</seclength>
@@ -283,13 +238,11 @@
 	    <secoffset>2097152</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bc680</ref>
-	  <geom><ref>0x80bc400</ref></geom>
+	<provider id="0x80bb700">
+	  <geom ref="0x80bb480"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0s1a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>1073741824</length>
 	    <seclength>2097152</seclength>
@@ -299,17 +252,14 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807238c</ref>
+  <class id="0x80734a0">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80bc000</ref>
-      <class><ref>0x807238c</ref></class>
+    <geom id="0x80bb000">
+      <class ref="0x80734a0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80bc000</ref></geom>
+	<provider id="0x80bb080">
+	  <geom ref="0x80bb000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T005/ref.conf b/tools/regression/geom/Test/T005/ref.conf
index 9a8dd33c5a70..762098fce17b 100644
--- a/tools/regression/geom/Test/T005/ref.conf
+++ b/tools/regression/geom/Test/T005/ref.conf
@@ -1,92 +1,76 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072460</ref>
+  <class id="0x8073560">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80b9680</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba700">
+      <class ref="0x8073560"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80b9680</ref></geom>
-	  <provider><ref>0x80b9400</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80ba700"/>
+	  <provider ref="0x80ba480"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9500</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba580">
+      <class ref="0x8073560"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80b9500</ref></geom>
-	  <provider><ref>0x80b9380</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80ba580"/>
+	  <provider ref="0x80ba400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9480</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba500">
+      <class ref="0x8073560"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80b9480</ref></geom>
-	  <provider><ref>0x80b9300</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80ba500"/>
+	  <provider ref="0x80ba380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9080</ref>
-      <class><ref>0x8072460</ref></class>
+    <geom id="0x80ba100">
+      <class ref="0x8073560"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80b9080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80ba100"/>
+	  <provider ref="0x80ba080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807243c</ref>
+  <class id="0x8073540">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072420</ref>
+  <class id="0x8073520">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x807247c</ref>
+  <class id="0x8073580">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80b9100</ref>
-      <class><ref>0x807247c</ref></class>
+    <geom id="0x80ba180">
+      <class ref="0x8073580"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80b9100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80ba180"/>
+	  <provider ref="0x80ba080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9400</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80ba480">
+	  <geom ref="0x80ba180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
@@ -94,13 +78,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9380</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80ba400">
+	  <geom ref="0x80ba180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
@@ -108,13 +90,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9300</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80ba380">
+	  <geom ref="0x80ba180"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
@@ -124,17 +104,14 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807236c</ref>
+  <class id="0x8073480">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80b9000</ref>
-      <class><ref>0x807236c</ref></class>
+    <geom id="0x80ba000">
+      <class ref="0x8073480"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80b9000</ref></geom>
+	<provider id="0x80ba080">
+	  <geom ref="0x80ba000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T006/ref.conf b/tools/regression/geom/Test/T006/ref.conf
index b49ddd3add41..0318852d517a 100644
--- a/tools/regression/geom/Test/T006/ref.conf
+++ b/tools/regression/geom/Test/T006/ref.conf
@@ -1,44 +1,35 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8071cc0</ref>
+  <class id="0x8073560">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80ba080</ref>
-      <class><ref>0x8071cc0</ref></class>
+    <geom id="0x80ba100">
+      <class ref="0x8073560"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80bb080</ref>
-	  <geom><ref>0x80ba080</ref></geom>
-	  <provider><ref>0x80bb000</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80ba100"/>
+	  <provider ref="0x80ba080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x8071c00</ref>
+  <class id="0x8073540">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8071ca0</ref>
+  <class id="0x8073520">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8071ce0</ref>
+  <class id="0x8073580">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x8071be0</ref>
+  <class id="0x8073480">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80ba040</ref>
-      <class><ref>0x8071be0</ref></class>
+    <geom id="0x80ba000">
+      <class ref="0x8073480"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80bb000</ref>
-	  <geom><ref>0x80ba040</ref></geom>
+	<provider id="0x80ba080">
+	  <geom ref="0x80ba000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T007/ref.conf b/tools/regression/geom/Test/T007/ref.conf
index a9abd7d7a177..c9295739f53d 100644
--- a/tools/regression/geom/Test/T007/ref.conf
+++ b/tools/regression/geom/Test/T007/ref.conf
@@ -1,23 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8071d00</ref>
+  <class id="0x8073580">
     <name>DEV-class</name>
   </class>
-  <class>
-    <ref>0x8071c40</ref>
+  <class id="0x8073560">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8071ce0</ref>
+  <class id="0x8073540">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8071d20</ref>
+  <class id="0x80735a0">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x8071c20</ref>
+  <class id="0x80734a0">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T008/ref.conf b/tools/regression/geom/Test/T008/ref.conf
index a9abd7d7a177..eec7f8093b53 100644
--- a/tools/regression/geom/Test/T008/ref.conf
+++ b/tools/regression/geom/Test/T008/ref.conf
@@ -1,23 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8071d00</ref>
+  <class id="0x80735a0">
     <name>DEV-class</name>
   </class>
-  <class>
-    <ref>0x8071c40</ref>
+  <class id="0x8073580">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8071ce0</ref>
+  <class id="0x8073560">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8071d20</ref>
+  <class id="0x80735c0">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x8071c20</ref>
+  <class id="0x80734c0">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T009/ref.conf b/tools/regression/geom/Test/T009/ref.conf
index 9fbe0023891a..7d9faf7dac53 100644
--- a/tools/regression/geom/Test/T009/ref.conf
+++ b/tools/regression/geom/Test/T009/ref.conf
@@ -1,23 +1,18 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8071da0</ref>
+  <class id="0x8073620">
     <name>DEV-class</name>
   </class>
-  <class>
-    <ref>0x8071ce0</ref>
+  <class id="0x8073600">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8071d80</ref>
+  <class id="0x80735e0">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8071dc0</ref>
+  <class id="0x8073640">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x8071cc0</ref>
+  <class id="0x8073540">
     <name>SIMDISK-class</name>
   </class>
 </mesh>
diff --git a/tools/regression/geom/Test/T010/ref.conf b/tools/regression/geom/Test/T010/ref.conf
index 927399c1be3e..77cc4b10a403 100644
--- a/tools/regression/geom/Test/T010/ref.conf
+++ b/tools/regression/geom/Test/T010/ref.conf
@@ -1,68 +1,56 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x80724c0</ref>
+  <class id="0x80735c0">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80bb400</ref>
-      <class><ref>0x80724c0</ref></class>
+    <geom id="0x80bc480">
+      <class ref="0x80735c0"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80bb400</ref></geom>
-	  <provider><ref>0x80bb380</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bc480"/>
+	  <provider ref="0x80bc400"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bb100</ref>
-      <class><ref>0x80724c0</ref></class>
+    <geom id="0x80bc180">
+      <class ref="0x80735c0"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80bb100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bc180"/>
+	  <provider ref="0x80bc100"/>
 	  <mode>r1w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x807249c</ref>
+  <class id="0x80735a0">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072480</ref>
+  <class id="0x8073580">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x80724dc</ref>
+  <class id="0x80735e0">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80bb180</ref>
-      <class><ref>0x80724dc</ref></class>
+    <geom id="0x80bc200">
+      <class ref="0x80735e0"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
-	<frontstuff>8192</frontstuff>
+	<labeloffset>0</labeloffset>
+	<frontstuff>0</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80bb180</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80bc200"/>
+	  <provider ref="0x80bc100"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bb380</ref>
-	  <geom><ref>0x80bb180</ref></geom>
+	<provider id="0x80bc400">
+	  <geom ref="0x80bc200"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>1474560</length>
 	    <seclength>2880</seclength>
@@ -72,17 +60,14 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x80723cc</ref>
+  <class id="0x80734e0">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80bb080</ref>
-      <class><ref>0x80723cc</ref></class>
+    <geom id="0x80bc080">
+      <class ref="0x80734e0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80bb080</ref></geom>
+	<provider id="0x80bc100">
+	  <geom ref="0x80bc080"/>
 	  <mode>r1w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T011/ref.conf b/tools/regression/geom/Test/T011/ref.conf
index 911704065552..fd8d739cfbfe 100644
--- a/tools/regression/geom/Test/T011/ref.conf
+++ b/tools/regression/geom/Test/T011/ref.conf
@@ -1,44 +1,35 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8071c40</ref>
+  <class id="0x80735c0">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80b70c0</ref>
-      <class><ref>0x8071c40</ref></class>
+    <geom id="0x80bc180">
+      <class ref="0x80735c0"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b7100</ref>
-	  <geom><ref>0x80b70c0</ref></geom>
-	  <provider><ref>0x80b7080</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bc180"/>
+	  <provider ref="0x80bc100"/>
 	  <mode>r1w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x8071b40</ref>
+  <class id="0x80735a0">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8071c00</ref>
+  <class id="0x8073580">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8071c80</ref>
+  <class id="0x80735e0">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x8071b00</ref>
+  <class id="0x80734e0">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80b7040</ref>
-      <class><ref>0x8071b00</ref></class>
+    <geom id="0x80bc080">
+      <class ref="0x80734e0"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b7080</ref>
-	  <geom><ref>0x80b7040</ref></geom>
+	<provider id="0x80bc100">
+	  <geom ref="0x80bc080"/>
 	  <mode>r1w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T012/ref.conf b/tools/regression/geom/Test/T012/ref.conf
index e4293f2e0bf0..8f66b2335d00 100644
--- a/tools/regression/geom/Test/T012/ref.conf
+++ b/tools/regression/geom/Test/T012/ref.conf
@@ -1,32 +1,26 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x80729cc</ref>
+  <class id="0x8073ae0">
     <name>SUNLABEL-class</name>
-    <geom>
-      <ref>0x80b9c00</ref>
-      <class><ref>0x80729cc</ref></class>
+    <geom id="0x80bbd00">
+      <class ref="0x8073ae0"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
-	  <provider><ref>0x80b8240</ref></provider>
+	<consumer id="0x80b9200">
+	  <geom ref="0x80bbd00"/>
+	  <provider ref="0x80bbc80"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9f80</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80c2080">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>7</index>
 	    <length>1343787008</length>
 	    <seclength>2624584</seclength>
@@ -34,13 +28,11 @@
 	    <secoffset>11011944</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9f00</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80c2000">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0g</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>6</index>
 	    <length>2149576704</length>
 	    <seclength>4198392</seclength>
@@ -48,13 +40,11 @@
 	    <secoffset>6813552</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9e80</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80bbf80">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0f</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>5</index>
 	    <length>2149576704</length>
 	    <seclength>4198392</seclength>
@@ -62,13 +52,11 @@
 	    <secoffset>2615160</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9e00</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80bbf00">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0d</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>3</index>
 	    <length>11124240384</length>
 	    <seclength>21727032</seclength>
@@ -76,13 +64,11 @@
 	    <secoffset>13636528</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9d80</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80bbe80">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>18108555264</length>
 	    <seclength>35368272</seclength>
@@ -90,13 +76,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9d00</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80bbe00">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>1075994624</length>
 	    <seclength>2101552</seclength>
@@ -104,13 +88,11 @@
 	    <secoffset>513608</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9c80</ref>
-	  <geom><ref>0x80b9c00</ref></geom>
+	<provider id="0x80bbd80">
+	  <geom ref="0x80bbd00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>262967296</length>
 	    <seclength>513608</seclength>
@@ -119,30 +101,25 @@
 	  </config>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9080</ref>
-      <class><ref>0x80729cc</ref></class>
+    <geom id="0x80bb100">
+      <class ref="0x8073ae0"/>
       <name>ad0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80b9080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9040">
+	  <geom ref="0x80bb100"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9300</ref>
-	  <geom><ref>0x80b9080</ref></geom>
+	<provider id="0x80bb380">
+	  <geom ref="0x80bb100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0h</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>7</index>
 	    <length>34629267456</length>
 	    <seclength>67635288</seclength>
@@ -150,13 +127,11 @@
 	    <secoffset>4041072</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9280</ref>
-	  <geom><ref>0x80b9080</ref></geom>
+	<provider id="0x80bb300">
+	  <geom ref="0x80bb100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>36698296320</length>
 	    <seclength>71676360</seclength>
@@ -164,13 +139,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9200</ref>
-	  <geom><ref>0x80b9080</ref></geom>
+	<provider id="0x80bb280">
+	  <geom ref="0x80bb100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>539320320</length>
 	    <seclength>1053360</seclength>
@@ -178,13 +151,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9180</ref>
-	  <geom><ref>0x80b9080</ref></geom>
+	<provider id="0x80bb200">
+	  <geom ref="0x80bb100"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>1529708544</length>
 	    <seclength>2987712</seclength>
@@ -194,201 +165,166 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x8072ae0</ref>
+  <class id="0x8073be0">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80c1980</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2a80">
+      <class ref="0x8073be0"/>
       <name>ad0h</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8480</ref>
-	  <geom><ref>0x80c1980</ref></geom>
-	  <provider><ref>0x80b9f80</ref></provider>
+	<consumer id="0x80b9400">
+	  <geom ref="0x80c2a80"/>
+	  <provider ref="0x80c2080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1800</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2900">
+      <class ref="0x8073be0"/>
       <name>ad0g</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8440</ref>
-	  <geom><ref>0x80c1800</ref></geom>
-	  <provider><ref>0x80b9f00</ref></provider>
+	<consumer id="0x80b93c0">
+	  <geom ref="0x80c2900"/>
+	  <provider ref="0x80c2000"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1680</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2780">
+      <class ref="0x8073be0"/>
       <name>ad0f</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8400</ref>
-	  <geom><ref>0x80c1680</ref></geom>
-	  <provider><ref>0x80b9e80</ref></provider>
+	<consumer id="0x80b9380">
+	  <geom ref="0x80c2780"/>
+	  <provider ref="0x80bbf80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1500</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2600">
+      <class ref="0x8073be0"/>
       <name>ad0d</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b83c0</ref>
-	  <geom><ref>0x80c1500</ref></geom>
-	  <provider><ref>0x80b9e00</ref></provider>
+	<consumer id="0x80b9340">
+	  <geom ref="0x80c2600"/>
+	  <provider ref="0x80bbf00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1380</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2480">
+      <class ref="0x8073be0"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8380</ref>
-	  <geom><ref>0x80c1380</ref></geom>
-	  <provider><ref>0x80b9d80</ref></provider>
+	<consumer id="0x80b9300">
+	  <geom ref="0x80c2480"/>
+	  <provider ref="0x80bbe80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1200</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2300">
+      <class ref="0x8073be0"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8340</ref>
-	  <geom><ref>0x80c1200</ref></geom>
-	  <provider><ref>0x80b9d00</ref></provider>
+	<consumer id="0x80b92c0">
+	  <geom ref="0x80c2300"/>
+	  <provider ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1080</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2180">
+      <class ref="0x8073be0"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80c1080</ref></geom>
-	  <provider><ref>0x80b9c80</ref></provider>
+	<consumer id="0x80b9280">
+	  <geom ref="0x80c2180"/>
+	  <provider ref="0x80bbd80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80c1000</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80c2100">
+      <class ref="0x8073be0"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80c1000</ref></geom>
-	  <provider><ref>0x80b8240</ref></provider>
+	<consumer id="0x80b9240">
+	  <geom ref="0x80c2100"/>
+	  <provider ref="0x80bbc80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9900</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80bb980">
+      <class ref="0x8073be0"/>
       <name>ad0h</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80b9900</ref></geom>
-	  <provider><ref>0x80b9300</ref></provider>
+	<consumer id="0x80b9180">
+	  <geom ref="0x80bb980"/>
+	  <provider ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9780</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80bb800">
+      <class ref="0x8073be0"/>
       <name>ad0c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80b9780</ref></geom>
-	  <provider><ref>0x80b9280</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80bb800"/>
+	  <provider ref="0x80bb300"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9580</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80bb600">
+      <class ref="0x8073be0"/>
       <name>ad0b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80b9580</ref></geom>
-	  <provider><ref>0x80b9200</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80bb600"/>
+	  <provider ref="0x80bb280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9400</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80bb480">
+      <class ref="0x8073be0"/>
       <name>ad0a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80b9400</ref></geom>
-	  <provider><ref>0x80b9180</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bb480"/>
+	  <provider ref="0x80bb200"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9380</ref>
-      <class><ref>0x8072ae0</ref></class>
+    <geom id="0x80bb400">
+      <class ref="0x8073be0"/>
       <name>ad0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80b9380</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9080">
+	  <geom ref="0x80bb400"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x8072abc</ref>
+  <class id="0x8073bc0">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072aa0</ref>
+  <class id="0x8073ba0">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8072afc</ref>
+  <class id="0x8073c00">
     <name>BSD-class</name>
   </class>
-  <class>
-    <ref>0x80729e8</ref>
+  <class id="0x8073b00">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80b9a80</ref>
-      <class><ref>0x80729e8</ref></class>
+    <geom id="0x80bbb00">
+      <class ref="0x8073b00"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80b9a80</ref></geom>
+	<provider id="0x80bbc80">
+	  <geom ref="0x80bbb00"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9000</ref>
-      <class><ref>0x80729e8</ref></class>
+    <geom id="0x80bb000">
+      <class ref="0x8073b00"/>
       <name>ad0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80b9000</ref></geom>
+	<provider id="0x80bb080">
+	  <geom ref="0x80bb000"/>
 	  <mode>r0w0e0</mode>
 	  <name>ad0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T013/ref.conf b/tools/regression/geom/Test/T013/ref.conf
index 5629a41bbba3..68e9fe7249dc 100644
--- a/tools/regression/geom/Test/T013/ref.conf
+++ b/tools/regression/geom/Test/T013/ref.conf
@@ -1,212 +1,176 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072500</ref>
+  <class id="0x8073600">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80bdb80</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0d00">
+      <class ref="0x8073600"/>
       <name>da2c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8580</ref>
-	  <geom><ref>0x80bdb80</ref></geom>
-	  <provider><ref>0x80b9d00</ref></provider>
+	<consumer id="0x80b94c0">
+	  <geom ref="0x80c0d00"/>
+	  <provider ref="0x80bbe80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bda00</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0b80">
+      <class ref="0x8073600"/>
       <name>da2b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8540</ref>
-	  <geom><ref>0x80bda00</ref></geom>
-	  <provider><ref>0x80b9c80</ref></provider>
+	<consumer id="0x80b9480">
+	  <geom ref="0x80c0b80"/>
+	  <provider ref="0x80bbe00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd880</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0a00">
+      <class ref="0x8073600"/>
       <name>da2a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8500</ref>
-	  <geom><ref>0x80bd880</ref></geom>
-	  <provider><ref>0x80b9c00</ref></provider>
+	<consumer id="0x80b9440">
+	  <geom ref="0x80c0a00"/>
+	  <provider ref="0x80bbd80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd700</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0880">
+      <class ref="0x8073600"/>
       <name>da1f</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b84c0</ref>
-	  <geom><ref>0x80bd700</ref></geom>
-	  <provider><ref>0x80b9980</ref></provider>
+	<consumer id="0x80b9400">
+	  <geom ref="0x80c0880"/>
+	  <provider ref="0x80bbb00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd580</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0700">
+      <class ref="0x8073600"/>
       <name>da1e</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8480</ref>
-	  <geom><ref>0x80bd580</ref></geom>
-	  <provider><ref>0x80b9900</ref></provider>
+	<consumer id="0x80b93c0">
+	  <geom ref="0x80c0700"/>
+	  <provider ref="0x80bba80"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd400</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0580">
+      <class ref="0x8073600"/>
       <name>da1c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8440</ref>
-	  <geom><ref>0x80bd400</ref></geom>
-	  <provider><ref>0x80b9880</ref></provider>
+	<consumer id="0x80b9380">
+	  <geom ref="0x80c0580"/>
+	  <provider ref="0x80bba00"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd280</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0400">
+      <class ref="0x8073600"/>
       <name>da1b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8400</ref>
-	  <geom><ref>0x80bd280</ref></geom>
-	  <provider><ref>0x80b9800</ref></provider>
+	<consumer id="0x80b9340">
+	  <geom ref="0x80c0400"/>
+	  <provider ref="0x80bb980"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bd100</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0280">
+      <class ref="0x8073600"/>
       <name>da1a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b83c0</ref>
-	  <geom><ref>0x80bd100</ref></geom>
-	  <provider><ref>0x80b9780</ref></provider>
+	<consumer id="0x80b9300">
+	  <geom ref="0x80c0280"/>
+	  <provider ref="0x80bb900"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9f80</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80c0100">
+      <class ref="0x8073600"/>
       <name>da0c</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8380</ref>
-	  <geom><ref>0x80b9f80</ref></geom>
-	  <provider><ref>0x80b9500</ref></provider>
+	<consumer id="0x80b92c0">
+	  <geom ref="0x80c0100"/>
+	  <provider ref="0x80bb680"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9e00</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80bbf80">
+      <class ref="0x8073600"/>
       <name>da0b</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8340</ref>
-	  <geom><ref>0x80b9e00</ref></geom>
-	  <provider><ref>0x80b9480</ref></provider>
+	<consumer id="0x80b9280">
+	  <geom ref="0x80bbf80"/>
+	  <provider ref="0x80bb600"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9d80</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80bbf00">
+      <class ref="0x8073600"/>
       <name>da0a</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8300</ref>
-	  <geom><ref>0x80b9d80</ref></geom>
-	  <provider><ref>0x80b9400</ref></provider>
+	<consumer id="0x80b9240">
+	  <geom ref="0x80bbf00"/>
+	  <provider ref="0x80bb580"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9a00</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80bbb80">
+      <class ref="0x8073600"/>
       <name>da2</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80b9a00</ref></geom>
-	  <provider><ref>0x80b8140</ref></provider>
+	<consumer id="0x80b91c0">
+	  <geom ref="0x80bbb80"/>
+	  <provider ref="0x80bb280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9580</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80bb700">
+      <class ref="0x8073600"/>
       <name>da1</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80b9580</ref></geom>
-	  <provider><ref>0x80b80c0</ref></provider>
+	<consumer id="0x80b9140">
+	  <geom ref="0x80bb700"/>
+	  <provider ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80b9180</ref>
-      <class><ref>0x8072500</ref></class>
+    <geom id="0x80bb300">
+      <class ref="0x8073600"/>
       <name>da0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80b9180</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b90c0">
+	  <geom ref="0x80bb300"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x80724dc</ref>
+  <class id="0x80735e0">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x80724c0</ref>
+  <class id="0x80735c0">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x807251c</ref>
+  <class id="0x8073620">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80b9a80</ref>
-      <class><ref>0x807251c</ref></class>
+    <geom id="0x80bbc00">
+      <class ref="0x8073620"/>
       <name>da2</name>
       <rank>2</rank>
       <config>
+	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b82c0</ref>
-	  <geom><ref>0x80b9a80</ref></geom>
-	  <provider><ref>0x80b8140</ref></provider>
+	<consumer id="0x80b9200">
+	  <geom ref="0x80bbc00"/>
+	  <provider ref="0x80bb280"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9d00</ref>
-	  <geom><ref>0x80b9a80</ref></geom>
+	<provider id="0x80bbe80">
+	  <geom ref="0x80bbc00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>74027520</length>
 	    <seclength>144585</seclength>
@@ -214,13 +178,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9c80</ref>
-	  <geom><ref>0x80b9a80</ref></geom>
+	<provider id="0x80bbe00">
+	  <geom ref="0x80bbc00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>4178442240</length>
 	    <seclength>8161020</seclength>
@@ -228,13 +190,11 @@
 	    <secoffset>4286806276</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9c00</ref>
-	  <geom><ref>0x80b9a80</ref></geom>
+	<provider id="0x80bbd80">
+	  <geom ref="0x80bbc00"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>24675840</length>
 	    <seclength>48195</seclength>
@@ -243,30 +203,26 @@
 	  </config>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9600</ref>
-      <class><ref>0x807251c</ref></class>
+    <geom id="0x80bb780">
+      <class ref="0x8073620"/>
       <name>da1</name>
       <rank>2</rank>
       <config>
+	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80b9600</ref></geom>
-	  <provider><ref>0x80b80c0</ref></provider>
+	<consumer id="0x80b9180">
+	  <geom ref="0x80bb780"/>
+	  <provider ref="0x80bb180"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9980</ref>
-	  <geom><ref>0x80b9600</ref></geom>
+	<provider id="0x80bbb00">
+	  <geom ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1f</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>5</index>
 	    <length>16951073792</length>
 	    <seclength>33107566</seclength>
@@ -274,13 +230,11 @@
 	    <secoffset>2654144</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9900</ref>
-	  <geom><ref>0x80b9600</ref></geom>
+	<provider id="0x80bba80">
+	  <geom ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1e</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>4</index>
 	    <length>20971520</length>
 	    <seclength>40960</seclength>
@@ -288,13 +242,11 @@
 	    <secoffset>2613184</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9880</ref>
-	  <geom><ref>0x80b9600</ref></geom>
+	<provider id="0x80bba00">
+	  <geom ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>18309995520</length>
 	    <seclength>35761710</seclength>
@@ -302,13 +254,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9800</ref>
-	  <geom><ref>0x80b9600</ref></geom>
+	<provider id="0x80bb980">
+	  <geom ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>1086291968</length>
 	    <seclength>2121664</seclength>
@@ -316,13 +266,11 @@
 	    <secoffset>491520</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9780</ref>
-	  <geom><ref>0x80b9600</ref></geom>
+	<provider id="0x80bb900">
+	  <geom ref="0x80bb780"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>251658240</length>
 	    <seclength>491520</seclength>
@@ -331,30 +279,26 @@
 	  </config>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9200</ref>
-      <class><ref>0x807251c</ref></class>
+    <geom id="0x80bb380">
+      <class ref="0x8073620"/>
       <name>da0</name>
       <rank>2</rank>
       <config>
+	<labeloffset>64</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80b9200</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80b9100">
+	  <geom ref="0x80bb380"/>
+	  <provider ref="0x80bb080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80b9500</ref>
-	  <geom><ref>0x80b9200</ref></geom>
+	<provider id="0x80bb680">
+	  <geom ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>4335206400</length>
 	    <seclength>8467200</seclength>
@@ -362,13 +306,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9480</ref>
-	  <geom><ref>0x80b9200</ref></geom>
+	<provider id="0x80bb600">
+	  <geom ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>270925824</length>
 	    <seclength>529152</seclength>
@@ -376,13 +318,11 @@
 	    <secoffset>7938048</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80b9400</ref>
-	  <geom><ref>0x80b9200</ref></geom>
+	<provider id="0x80bb580">
+	  <geom ref="0x80bb380"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>4064280576</length>
 	    <seclength>7938048</seclength>
@@ -392,41 +332,34 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x807240c</ref>
+  <class id="0x8073520">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80b9100</ref>
-      <class><ref>0x807240c</ref></class>
+    <geom id="0x80bb200">
+      <class ref="0x8073520"/>
       <name>da2</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80b9100</ref></geom>
+	<provider id="0x80bb280">
+	  <geom ref="0x80bb200"/>
 	  <mode>r0w0e0</mode>
 	  <name>da2</name>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9080</ref>
-      <class><ref>0x807240c</ref></class>
+    <geom id="0x80bb100">
+      <class ref="0x8073520"/>
       <name>da1</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80b9080</ref></geom>
+	<provider id="0x80bb180">
+	  <geom ref="0x80bb100"/>
 	  <mode>r0w0e0</mode>
 	  <name>da1</name>
 	</provider>
     </geom>
-    <geom>
-      <ref>0x80b9000</ref>
-      <class><ref>0x807240c</ref></class>
+    <geom id="0x80bb000">
+      <class ref="0x8073520"/>
       <name>da0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80b9000</ref></geom>
+	<provider id="0x80bb080">
+	  <geom ref="0x80bb000"/>
 	  <mode>r0w0e0</mode>
 	  <name>da0</name>
 	</provider>
diff --git a/tools/regression/geom/Test/T014/ref.conf b/tools/regression/geom/Test/T014/ref.conf
index c57ae10721ad..6688fd1ea451 100644
--- a/tools/regression/geom/Test/T014/ref.conf
+++ b/tools/regression/geom/Test/T014/ref.conf
@@ -1,120 +1,99 @@
 <mesh>
   <FreeBSD>$FreeBSD$</FreeBSD>
-  <class>
-    <ref>0x8072c60</ref>
+  <class id="0x80740e0">
     <name>DEV-class</name>
-    <geom>
-      <ref>0x80bbd80</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bce00">
+      <class ref="0x80740e0"/>
       <name>wd0s1f</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8280</ref>
-	  <geom><ref>0x80bbd80</ref></geom>
-	  <provider><ref>0x80bb800</ref></provider>
+	<consumer id="0x80ba240">
+	  <geom ref="0x80bce00"/>
+	  <provider ref="0x80bc880"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bbc00</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bcc80">
+      <class ref="0x80740e0"/>
       <name>wd0s1e</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8240</ref>
-	  <geom><ref>0x80bbc00</ref></geom>
-	  <provider><ref>0x80bb780</ref></provider>
+	<consumer id="0x80ba200">
+	  <geom ref="0x80bcc80"/>
+	  <provider ref="0x80bc800"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bba80</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bcb00">
+      <class ref="0x80740e0"/>
       <name>wd0s1c</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8200</ref>
-	  <geom><ref>0x80bba80</ref></geom>
-	  <provider><ref>0x80bb700</ref></provider>
+	<consumer id="0x80ba1c0">
+	  <geom ref="0x80bcb00"/>
+	  <provider ref="0x80bc780"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bb900</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bc980">
+      <class ref="0x80740e0"/>
       <name>wd0s1b</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b81c0</ref>
-	  <geom><ref>0x80bb900</ref></geom>
-	  <provider><ref>0x80bb680</ref></provider>
+	<consumer id="0x80ba180">
+	  <geom ref="0x80bc980"/>
+	  <provider ref="0x80bc700"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bb880</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bc900">
+      <class ref="0x80740e0"/>
       <name>wd0s1a</name>
       <rank>4</rank>
-	<consumer>
-	  <ref>0x80b8180</ref>
-	  <geom><ref>0x80bb880</ref></geom>
-	  <provider><ref>0x80bb600</ref></provider>
+	<consumer id="0x80ba140">
+	  <geom ref="0x80bc900"/>
+	  <provider ref="0x80bc680"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bb280</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bc300">
+      <class ref="0x80740e0"/>
       <name>wd0s1</name>
       <rank>3</rank>
-	<consumer>
-	  <ref>0x80b8100</ref>
-	  <geom><ref>0x80bb280</ref></geom>
-	  <provider><ref>0x80bb200</ref></provider>
+	<consumer id="0x80ba0c0">
+	  <geom ref="0x80bc300"/>
+	  <provider ref="0x80bc280"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
-    <geom>
-      <ref>0x80bb080</ref>
-      <class><ref>0x8072c60</ref></class>
+    <geom id="0x80bc100">
+      <class ref="0x80740e0"/>
       <name>wd0</name>
       <rank>2</rank>
-	<consumer>
-	  <ref>0x80b8080</ref>
-	  <geom><ref>0x80bb080</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80ba040">
+	  <geom ref="0x80bc100"/>
+	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	</consumer>
     </geom>
   </class>
-  <class>
-    <ref>0x8072b4c</ref>
+  <class id="0x8073fc0">
     <name>PC98-class</name>
-    <geom>
-      <ref>0x80bb100</ref>
-      <class><ref>0x8072b4c</ref></class>
+    <geom id="0x80bc180">
+      <class ref="0x8073fc0"/>
       <name>wd0</name>
       <rank>2</rank>
       <config>
 	<frontstuff>8704</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b80c0</ref>
-	  <geom><ref>0x80bb100</ref></geom>
-	  <provider><ref>0x80b8040</ref></provider>
+	<consumer id="0x80ba080">
+	  <geom ref="0x80bc180"/>
+	  <provider ref="0x80bc080"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8704</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bb200</ref>
-	  <geom><ref>0x80bb100</ref></geom>
+	<provider id="0x80bc280">
+	  <geom ref="0x80bc180"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1</name>
 	  <config>
-	    <frontstuff>8704</frontstuff>
 	    <index>0</index>
 	    <length>1626533888</length>
 	    <seclength>3176824</seclength>
@@ -124,45 +103,37 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x8072b68</ref>
+  <class id="0x8073fe0">
     <name>SUNLABEL-class</name>
   </class>
-  <class>
-    <ref>0x8072c3c</ref>
+  <class id="0x80740c0">
     <name>MBREXT-class</name>
   </class>
-  <class>
-    <ref>0x8072c20</ref>
+  <class id="0x80740a0">
     <name>MBR-class</name>
   </class>
-  <class>
-    <ref>0x8072c7c</ref>
+  <class id="0x8074100">
     <name>BSD-class</name>
-    <geom>
-      <ref>0x80bb400</ref>
-      <class><ref>0x8072c7c</ref></class>
+    <geom id="0x80bc480">
+      <class ref="0x8074100"/>
       <name>wd0s1</name>
       <rank>3</rank>
       <config>
+	<labeloffset>512</labeloffset>
 	<frontstuff>8192</frontstuff>
       </config>
-	<consumer>
-	  <ref>0x80b8140</ref>
-	  <geom><ref>0x80bb400</ref></geom>
-	  <provider><ref>0x80bb200</ref></provider>
+	<consumer id="0x80ba100">
+	  <geom ref="0x80bc480"/>
+	  <provider ref="0x80bc280"/>
 	  <mode>r0w0e0</mode>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	  </config>
 	</consumer>
-	<provider>
-	  <ref>0x80bb800</ref>
-	  <geom><ref>0x80bb400</ref></geom>
+	<provider id="0x80bc880">
+	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1f</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>5</index>
 	    <length>1390673920</length>
 	    <seclength>2716160</seclength>
@@ -170,13 +141,11 @@
 	    <secoffset>460800</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bb780</ref>
-	  <geom><ref>0x80bb400</ref></geom>
+	<provider id="0x80bc800">
+	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1e</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>4</index>
 	    <length>52428800</length>
 	    <seclength>102400</seclength>
@@ -184,13 +153,11 @@
 	    <secoffset>358400</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bb700</ref>
-	  <geom><ref>0x80bb400</ref></geom>
+	<provider id="0x80bc780">
+	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1c</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>2</index>
 	    <length>1626603520</length>
 	    <seclength>3176960</seclength>
@@ -198,13 +165,11 @@
 	    <secoffset>0</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bb680</ref>
-	  <geom><ref>0x80bb400</ref></geom>
+	<provider id="0x80bc700">
+	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1b</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>1</index>
 	    <length>104857600</length>
 	    <seclength>204800</seclength>
@@ -212,13 +177,11 @@
 	    <secoffset>153600</secoffset>
 	  </config>
 	</provider>
-	<provider>
-	  <ref>0x80bb600</ref>
-	  <geom><ref>0x80bb400</ref></geom>
+	<provider id="0x80bc680">
+	  <geom ref="0x80bc480"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0s1a</name>
 	  <config>
-	    <frontstuff>8192</frontstuff>
 	    <index>0</index>
 	    <length>78643200</length>
 	    <seclength>153600</seclength>
@@ -228,17 +191,14 @@
 	</provider>
     </geom>
   </class>
-  <class>
-    <ref>0x8072b84</ref>
+  <class id="0x8074000">
     <name>SIMDISK-class</name>
-    <geom>
-      <ref>0x80bb000</ref>
-      <class><ref>0x8072b84</ref></class>
+    <geom id="0x80bc000">
+      <class ref="0x8074000"/>
       <name>wd0</name>
       <rank>1</rank>
-	<provider>
-	  <ref>0x80b8040</ref>
-	  <geom><ref>0x80bb000</ref></geom>
+	<provider id="0x80bc080">
+	  <geom ref="0x80bc000"/>
 	  <mode>r0w0e0</mode>
 	  <name>wd0</name>
 	</provider>