<!ATTLIST trace_connect trace CDATA #REQUIRED>
<!ATTLIST trace_connect element CDATA #REQUIRED>
-<!ELEMENT AS (((AS|include|storage|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((include|storage|host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
+<!ELEMENT AS (((AS|include|storage_type|storage|link|cluster|peer|trace|trace_connect)*,(ASroute|trace|trace_connect)*,(bypassRoute|trace|trace_connect)*)|((include|storage_type|storage|host|router|link|trace|trace_connect)*,(route|trace|trace_connect)*))>
<!ATTLIST AS id CDATA #REQUIRED>
<!ATTLIST AS routing CDATA #REQUIRED>
+<!ELEMENT storage_type (prop*)>
+<!ATTLIST storage_type id CDATA #REQUIRED>
+<!ATTLIST storage_type model CDATA #REQUIRED>
+<!ATTLIST storage_type content CDATA "0">
+
<!ELEMENT storage (prop*)>
<!ATTLIST storage id CDATA #REQUIRED>
-<!ATTLIST storage type CDATA #REQUIRED>
-<!ATTLIST storage content CDATA "0">
+<!ATTLIST storage typeId CDATA #REQUIRED>
+
+<!ELEMENT mount EMPTY>
+<!ATTLIST mount id CDATA #REQUIRED>
+<!ATTLIST mount name CDATA #REQUIRED>
+
+<!ELEMENT mstorage EMPTY>
+<!ATTLIST mstorage typeId CDATA #REQUIRED>
+<!ATTLIST mstorage name CDATA #REQUIRED>
-<!ELEMENT host (prop*)>
+<!ELEMENT host (prop|mount|mstorage)*>
<!ATTLIST host id CDATA #REQUIRED>
<!ATTLIST host power CDATA #REQUIRED>
<!ATTLIST host core CDATA "1">