diff --git a/b2/HIERARCHY b/b2/HIERARCHY
index a81ddb8..4a01230 100644
--- a/b2/HIERARCHY
+++ b/b2/HIERARCHY
@@ -1,7 +1,14 @@
-<comp> = R<C<L;
+<comp> = R<C<L<D;
+<diode> = D<SCH<Z<TVS;
 
 T=<comp> {
 	R:	{ R=#R TOL=%R };
-	C:	{ C=#F TOL=%C };
-	L:	{ L=#H TOL=%L };
+	C:	{ C=#F TOL=%C V=#V };
+	L:	{ L=#H TOL=%L I=#A };
+	D:	{ C=#F }
+		M=<diode> {
+			TVS:	{ Vac=#V Vdc=#V };
+			Z:	{ V=#V I=#A };
+			*:	{ Vf=#V Vr=#V I=#A };
+		};
 }