diff --git a/doc/ua/nodesetexample.bsd b/doc/ua/nodesetexample.bsd
index 69cb02e..c999c94 100644
--- a/doc/ua/nodesetexample.bsd
+++ b/doc/ua/nodesetexample.bsd
@@ -1,5 +1,10 @@
 <opc:TypeDictionary xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://yourorganisation.org/NodeSetExample/" DefaultByteOrder="LittleEndian" xmlns:opc="http://opcfoundation.org/BinarySchema/" xmlns:ua="http://opcfoundation.org/UA/" TargetNamespace="http://yourorganisation.org/NodeSetExample/">
     <opc:Import Namespace="http://opcfoundation.org/UA/"/>
+    <opc:StructuredType BaseType="ua:ExtensionObject" Name="MyComplexStructureType">
+        <opc:Field TypeName="opc:Double" Name="Element1"/>
+        <opc:Field TypeName="tns:MyStructureType" Name="Element2"/>
+        <opc:Field TypeName="tns:EnumSimpleType" Name="Element3"/>
+    </opc:StructuredType>
     <opc:StructuredType BaseType="ua:ExtensionObject" Name="MyStructureType">
         <opc:Field TypeName="opc:Bit" Name="Element3Specified"/>
         <opc:Field Length="31" TypeName="opc:Bit" Name="Reserved1"/>
diff --git a/doc/ua/nodesetexample.ua b/doc/ua/nodesetexample.ua
index f48c532..e6e315b 100644
Binary files a/doc/ua/nodesetexample.ua and b/doc/ua/nodesetexample.ua differ
diff --git a/doc/ua/nodesetexample.xml b/doc/ua/nodesetexample.xml
index 591e59c..0f5efe9 100644
--- a/doc/ua/nodesetexample.xml
+++ b/doc/ua/nodesetexample.xml
@@ -15,14 +15,16 @@
         <Alias Alias="HasSubtype">i=45</Alias>
         <Alias Alias="HasProperty">i=46</Alias>
         <Alias Alias="HasComponent">i=47</Alias>
+        <Alias Alias="Argument">i=296</Alias>
         <Alias Alias="EnumValueType">i=7594</Alias>
         <Alias Alias="EnumSimpleType">ns=1;i=3002</Alias>
         <Alias Alias="EnumGapType">ns=1;i=3003</Alias>
         <Alias Alias="MyStructureType">ns=1;i=3004</Alias>
+        <Alias Alias="MyComplexStructureType">ns=1;i=3005</Alias>
     </Aliases>
     <Extensions>
         <Extension>
-            <ModelInfo Tool="UaModeler" Hash="UngVwF//DsOUI+0bjnzRjg==" Version="1.4.1"/>
+            <ModelInfo Tool="UaModeler" Hash="piq6mYXxXn3jeUdw2sX2UQ==" Version="1.4.1"/>
         </Extension>
     </Extensions>
     <UADataType NodeId="ns=1;i=3003" BrowseName="1:EnumGapType">
@@ -124,6 +126,41 @@
             </uax:ListOfLocalizedText>
         </Value>
     </UAVariable>
+    <UADataType NodeId="ns=1;i=3005" BrowseName="1:MyComplexStructureType">
+        <DisplayName>MyComplexStructureType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasEncoding">ns=1;i=5006</Reference>
+            <Reference ReferenceType="HasEncoding">ns=1;i=5007</Reference>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=22</Reference>
+        </References>
+        <Definition Name="1:MyComplexStructureType">
+            <Field DataType="Double" Name="Element1"/>
+            <Field DataType="MyStructureType" Name="Element2"/>
+            <Field DataType="EnumSimpleType" Name="Element3"/>
+        </Definition>
+    </UADataType>
+    <UAVariable DataType="String" ParentNodeId="ns=1;i=6003" NodeId="ns=1;i=6016" BrowseName="1:MyComplexStructureType">
+        <DisplayName>MyComplexStructureType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
+            <Reference ReferenceType="HasDescription" IsForward="false">ns=1;i=5006</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6003</Reference>
+        </References>
+        <Value>
+            <uax:String>MyComplexStructureType</uax:String>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="String" ParentNodeId="ns=1;i=6007" NodeId="ns=1;i=6017" BrowseName="1:MyComplexStructureType">
+        <DisplayName>MyComplexStructureType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=69</Reference>
+            <Reference ReferenceType="HasDescription" IsForward="false">ns=1;i=5007</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=6007</Reference>
+        </References>
+        <Value>
+            <uax:String>//xs:element[@name='MyComplexStructureType']</uax:String>
+        </Value>
+    </UAVariable>
     <UADataType NodeId="ns=1;i=3004" BrowseName="1:MyStructureType">
         <DisplayName>MyStructureType</DisplayName>
         <References>
@@ -166,6 +203,7 @@
         <Description>Collects the data type descriptions of http://yourorganisation.org/NodeSetExample/</Description>
         <References>
             <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
+            <Reference ReferenceType="HasComponent">ns=1;i=6016</Reference>
             <Reference ReferenceType="HasComponent">ns=1;i=6009</Reference>
             <Reference ReferenceType="HasProperty">ns=1;i=6006</Reference>
             <Reference ReferenceType="HasComponent" IsForward="false">i=93</Reference>
@@ -178,23 +216,28 @@
         mh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9yZy9VQS8iIFRhcmdldE5hbWVzcGFjZT0iaHR0cDovL
         3lvdXJvcmdhbmlzYXRpb24ub3JnL05vZGVTZXRFeGFtcGxlLyI+CiA8b3BjOkltcG9ydCBOY
         W1lc3BhY2U9Imh0dHA6Ly9vcGNmb3VuZGF0aW9uLm9yZy9VQS8iLz4KIDxvcGM6U3RydWN0d
-        XJlZFR5cGUgQmFzZVR5cGU9InVhOkV4dGVuc2lvbk9iamVjdCIgTmFtZT0iTXlTdHJ1Y3R1c
-        mVUeXBlIj4KICA8b3BjOkZpZWxkIFR5cGVOYW1lPSJvcGM6Qml0IiBOYW1lPSJFbGVtZW50M
-        1NwZWNpZmllZCIvPgogIDxvcGM6RmllbGQgTGVuZ3RoPSIzMSIgVHlwZU5hbWU9Im9wYzpCa
-        XQiIE5hbWU9IlJlc2VydmVkMSIvPgogIDxvcGM6RmllbGQgVHlwZU5hbWU9Im9wYzpEb3Vib
-        GUiIE5hbWU9IkVsZW1lbnQxIi8+CiAgPG9wYzpGaWVsZCBUeXBlTmFtZT0ib3BjOkRvdWJsZ
-        SIgTmFtZT0iRWxlbWVudDIiLz4KICA8b3BjOkZpZWxkIFN3aXRjaEZpZWxkPSJFbGVtZW50M
-        1NwZWNpZmllZCIgVHlwZU5hbWU9Im9wYzpEb3VibGUiIE5hbWU9IkVsZW1lbnQzIi8+CiA8L
-        29wYzpTdHJ1Y3R1cmVkVHlwZT4KIDxvcGM6RW51bWVyYXRlZFR5cGUgTGVuZ3RoSW5CaXRzP
-        SIzMiIgTmFtZT0iRW51bUdhcFR5cGUiPgogIDxvcGM6RW51bWVyYXRlZFZhbHVlIE5hbWU9I
-        kVudW0xIiBWYWx1ZT0iLTEiLz4KICA8b3BjOkVudW1lcmF0ZWRWYWx1ZSBOYW1lPSJFbnVtM
-        iIgVmFsdWU9IjMiLz4KICA8b3BjOkVudW1lcmF0ZWRWYWx1ZSBOYW1lPSJFbnVtMyIgVmFsd
-        WU9IjUiLz4KIDwvb3BjOkVudW1lcmF0ZWRUeXBlPgogPG9wYzpFbnVtZXJhdGVkVHlwZSBMZ
-        W5ndGhJbkJpdHM9IjMyIiBOYW1lPSJFbnVtU2ltcGxlVHlwZSI+CiAgPG9wYzpFbnVtZXJhd
-        GVkVmFsdWUgTmFtZT0iRW51bTEiIFZhbHVlPSIwIi8+CiAgPG9wYzpFbnVtZXJhdGVkVmFsd
-        WUgTmFtZT0iRW51bTIiIFZhbHVlPSIxIi8+CiAgPG9wYzpFbnVtZXJhdGVkVmFsdWUgTmFtZ
-        T0iRW51bTMiIFZhbHVlPSIyIi8+CiA8L29wYzpFbnVtZXJhdGVkVHlwZT4KPC9vcGM6VHlwZ
-        URpY3Rpb25hcnk+Cg==</uax:ByteString>
+        XJlZFR5cGUgQmFzZVR5cGU9InVhOkV4dGVuc2lvbk9iamVjdCIgTmFtZT0iTXlDb21wbGV4U
+        3RydWN0dXJlVHlwZSI+CiAgPG9wYzpGaWVsZCBUeXBlTmFtZT0ib3BjOkRvdWJsZSIgTmFtZ
+        T0iRWxlbWVudDEiLz4KICA8b3BjOkZpZWxkIFR5cGVOYW1lPSJ0bnM6TXlTdHJ1Y3R1cmVUe
+        XBlIiBOYW1lPSJFbGVtZW50MiIvPgogIDxvcGM6RmllbGQgVHlwZU5hbWU9InRuczpFbnVtU
+        2ltcGxlVHlwZSIgTmFtZT0iRWxlbWVudDMiLz4KIDwvb3BjOlN0cnVjdHVyZWRUeXBlPgogP
+        G9wYzpTdHJ1Y3R1cmVkVHlwZSBCYXNlVHlwZT0idWE6RXh0ZW5zaW9uT2JqZWN0IiBOYW1lP
+        SJNeVN0cnVjdHVyZVR5cGUiPgogIDxvcGM6RmllbGQgVHlwZU5hbWU9Im9wYzpCaXQiIE5hb
+        WU9IkVsZW1lbnQzU3BlY2lmaWVkIi8+CiAgPG9wYzpGaWVsZCBMZW5ndGg9IjMxIiBUeXBlT
+        mFtZT0ib3BjOkJpdCIgTmFtZT0iUmVzZXJ2ZWQxIi8+CiAgPG9wYzpGaWVsZCBUeXBlTmFtZ
+        T0ib3BjOkRvdWJsZSIgTmFtZT0iRWxlbWVudDEiLz4KICA8b3BjOkZpZWxkIFR5cGVOYW1lP
+        SJvcGM6RG91YmxlIiBOYW1lPSJFbGVtZW50MiIvPgogIDxvcGM6RmllbGQgU3dpdGNoRmllb
+        GQ9IkVsZW1lbnQzU3BlY2lmaWVkIiBUeXBlTmFtZT0ib3BjOkRvdWJsZSIgTmFtZT0iRWxlb
+        WVudDMiLz4KIDwvb3BjOlN0cnVjdHVyZWRUeXBlPgogPG9wYzpFbnVtZXJhdGVkVHlwZSBMZ
+        W5ndGhJbkJpdHM9IjMyIiBOYW1lPSJFbnVtR2FwVHlwZSI+CiAgPG9wYzpFbnVtZXJhdGVkV
+        mFsdWUgTmFtZT0iRW51bTEiIFZhbHVlPSItMSIvPgogIDxvcGM6RW51bWVyYXRlZFZhbHVlI
+        E5hbWU9IkVudW0yIiBWYWx1ZT0iMyIvPgogIDxvcGM6RW51bWVyYXRlZFZhbHVlIE5hbWU9I
+        kVudW0zIiBWYWx1ZT0iNSIvPgogPC9vcGM6RW51bWVyYXRlZFR5cGU+CiA8b3BjOkVudW1lc
+        mF0ZWRUeXBlIExlbmd0aEluQml0cz0iMzIiIE5hbWU9IkVudW1TaW1wbGVUeXBlIj4KICA8b
+        3BjOkVudW1lcmF0ZWRWYWx1ZSBOYW1lPSJFbnVtMSIgVmFsdWU9IjAiLz4KICA8b3BjOkVud
+        W1lcmF0ZWRWYWx1ZSBOYW1lPSJFbnVtMiIgVmFsdWU9IjEiLz4KICA8b3BjOkVudW1lcmF0Z
+        WRWYWx1ZSBOYW1lPSJFbnVtMyIgVmFsdWU9IjIiLz4KIDwvb3BjOkVudW1lcmF0ZWRUeXBlP
+        go8L29wYzpUeXBlRGljdGlvbmFyeT4K</uax:ByteString>
         </Value>
     </UAVariable>
     <UAVariable DataType="String" Historizing="true" ParentNodeId="ns=1;i=6003" NodeId="ns=1;i=6006" BrowseName="NamespaceUri">
@@ -212,6 +255,7 @@
         <Description>Collects the data type descriptions of http://yourorganisation.org/NodeSetExample/</Description>
         <References>
             <Reference ReferenceType="HasTypeDefinition">i=72</Reference>
+            <Reference ReferenceType="HasComponent">ns=1;i=6017</Reference>
             <Reference ReferenceType="HasComponent">ns=1;i=6010</Reference>
             <Reference ReferenceType="HasProperty">ns=1;i=6008</Reference>
             <Reference ReferenceType="HasComponent" IsForward="false">i=92</Reference>
@@ -245,22 +289,37 @@
         W1TaW1wbGVUeXBlIiBuaWxsYWJsZT0idHJ1ZSIvPgogIDwveHM6c2VxdWVuY2U+CiA8L3hzO
         mNvbXBsZXhUeXBlPgogPHhzOmVsZW1lbnQgdHlwZT0idG5zOkxpc3RPZkVudW1TaW1wbGVUe
         XBlIiBuYW1lPSJMaXN0T2ZFbnVtU2ltcGxlVHlwZSIgbmlsbGFibGU9InRydWUiLz4KIDx4c
-        zpjb21wbGV4VHlwZSBuYW1lPSJNeVN0cnVjdHVyZVR5cGUiPgogIDx4czpzZXF1ZW5jZT4KI
-        CAgPHhzOmVsZW1lbnQgbWluT2NjdXJzPSIwIiB0eXBlPSJ4czp1bnNpZ25lZEludCIgbmFtZ
-        T0iRW5jb2RpbmdNYXNrIi8+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vycz0iMCIgbWF4T2Njd
-        XJzPSIxIiB0eXBlPSJ4czpkb3VibGUiIG5hbWU9IkVsZW1lbnQxIi8+CiAgIDx4czplbGVtZ
-        W50IG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSIxIiB0eXBlPSJ4czpkb3VibGUiIG5hbWU9I
-        kVsZW1lbnQyIi8+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSIxI
-        iB0eXBlPSJ4czpkb3VibGUiIG5hbWU9IkVsZW1lbnQzIi8+CiAgPC94czpzZXF1ZW5jZT4KI
-        CA8eHM6YXR0cmlidXRlIG5hbWU9IkVuY29kaW5nVGFibGUiIGZpeGVkPSJFbGVtZW50MzowI
-        i8+CiA8L3hzOmNvbXBsZXhUeXBlPgogPHhzOmVsZW1lbnQgdHlwZT0idG5zOk15U3RydWN0d
-        XJlVHlwZSIgbmFtZT0iTXlTdHJ1Y3R1cmVUeXBlIi8+CiA8eHM6Y29tcGxleFR5cGUgbmFtZ
-        T0iTGlzdE9mTXlTdHJ1Y3R1cmVUeXBlIj4KICA8eHM6c2VxdWVuY2U+CiAgIDx4czplbGVtZ
-        W50IG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1bmJvdW5kZWQiIHR5cGU9InRuczpNeVN0c
-        nVjdHVyZVR5cGUiIG5hbWU9Ik15U3RydWN0dXJlVHlwZSIgbmlsbGFibGU9InRydWUiLz4KI
-        CA8L3hzOnNlcXVlbmNlPgogPC94czpjb21wbGV4VHlwZT4KIDx4czplbGVtZW50IHR5cGU9I
-        nRuczpMaXN0T2ZNeVN0cnVjdHVyZVR5cGUiIG5hbWU9Ikxpc3RPZk15U3RydWN0dXJlVHlwZ
-        SIgbmlsbGFibGU9InRydWUiLz4KPC94czpzY2hlbWE+Cg==</uax:ByteString>
+        zpjb21wbGV4VHlwZSBuYW1lPSJNeUNvbXBsZXhTdHJ1Y3R1cmVUeXBlIj4KICA8eHM6c2Vxd
+        WVuY2U+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSIxIiB0eXBlP
+        SJ4czpkb3VibGUiIG5hbWU9IkVsZW1lbnQxIi8+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vyc
+        z0iMCIgbWF4T2NjdXJzPSIxIiB0eXBlPSJ0bnM6TXlTdHJ1Y3R1cmVUeXBlIiBuYW1lPSJFb
+        GVtZW50MiIvPgogICA8eHM6ZWxlbWVudCBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0iMSIgd
+        HlwZT0idG5zOkVudW1TaW1wbGVUeXBlIiBuYW1lPSJFbGVtZW50MyIvPgogIDwveHM6c2Vxd
+        WVuY2U+CiA8L3hzOmNvbXBsZXhUeXBlPgogPHhzOmVsZW1lbnQgdHlwZT0idG5zOk15Q29tc
+        GxleFN0cnVjdHVyZVR5cGUiIG5hbWU9Ik15Q29tcGxleFN0cnVjdHVyZVR5cGUiLz4KIDx4c
+        zpjb21wbGV4VHlwZSBuYW1lPSJMaXN0T2ZNeUNvbXBsZXhTdHJ1Y3R1cmVUeXBlIj4KICA8e
+        HM6c2VxdWVuY2U+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vycz0iMCIgbWF4T2NjdXJzPSJ1b
+        mJvdW5kZWQiIHR5cGU9InRuczpNeUNvbXBsZXhTdHJ1Y3R1cmVUeXBlIiBuYW1lPSJNeUNvb
+        XBsZXhTdHJ1Y3R1cmVUeXBlIiBuaWxsYWJsZT0idHJ1ZSIvPgogIDwveHM6c2VxdWVuY2U+C
+        iA8L3hzOmNvbXBsZXhUeXBlPgogPHhzOmVsZW1lbnQgdHlwZT0idG5zOkxpc3RPZk15Q29tc
+        GxleFN0cnVjdHVyZVR5cGUiIG5hbWU9Ikxpc3RPZk15Q29tcGxleFN0cnVjdHVyZVR5cGUiI
+        G5pbGxhYmxlPSJ0cnVlIi8+CiA8eHM6Y29tcGxleFR5cGUgbmFtZT0iTXlTdHJ1Y3R1cmVUe
+        XBlIj4KICA8eHM6c2VxdWVuY2U+CiAgIDx4czplbGVtZW50IG1pbk9jY3Vycz0iMCIgdHlwZ
+        T0ieHM6dW5zaWduZWRJbnQiIG5hbWU9IkVuY29kaW5nTWFzayIvPgogICA8eHM6ZWxlbWVud
+        CBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0iMSIgdHlwZT0ieHM6ZG91YmxlIiBuYW1lPSJFb
+        GVtZW50MSIvPgogICA8eHM6ZWxlbWVudCBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0iMSIgd
+        HlwZT0ieHM6ZG91YmxlIiBuYW1lPSJFbGVtZW50MiIvPgogICA8eHM6ZWxlbWVudCBtaW5PY
+        2N1cnM9IjAiIG1heE9jY3Vycz0iMSIgdHlwZT0ieHM6ZG91YmxlIiBuYW1lPSJFbGVtZW50M
+        yIvPgogIDwveHM6c2VxdWVuY2U+CiAgPHhzOmF0dHJpYnV0ZSBuYW1lPSJFbmNvZGluZ1RhY
+        mxlIiBmaXhlZD0iRWxlbWVudDM6MCIvPgogPC94czpjb21wbGV4VHlwZT4KIDx4czplbGVtZ
+        W50IHR5cGU9InRuczpNeVN0cnVjdHVyZVR5cGUiIG5hbWU9Ik15U3RydWN0dXJlVHlwZSIvP
+        gogPHhzOmNvbXBsZXhUeXBlIG5hbWU9Ikxpc3RPZk15U3RydWN0dXJlVHlwZSI+CiAgPHhzO
+        nNlcXVlbmNlPgogICA8eHM6ZWxlbWVudCBtaW5PY2N1cnM9IjAiIG1heE9jY3Vycz0idW5ib
+        3VuZGVkIiB0eXBlPSJ0bnM6TXlTdHJ1Y3R1cmVUeXBlIiBuYW1lPSJNeVN0cnVjdHVyZVR5c
+        GUiIG5pbGxhYmxlPSJ0cnVlIi8+CiAgPC94czpzZXF1ZW5jZT4KIDwveHM6Y29tcGxleFR5c
+        GU+CiA8eHM6ZWxlbWVudCB0eXBlPSJ0bnM6TGlzdE9mTXlTdHJ1Y3R1cmVUeXBlIiBuYW1lP
+        SJMaXN0T2ZNeVN0cnVjdHVyZVR5cGUiIG5pbGxhYmxlPSJ0cnVlIi8+CjwveHM6c2NoZW1hP
+        go=</uax:ByteString>
         </Value>
     </UAVariable>
     <UAVariable DataType="String" Historizing="true" ParentNodeId="ns=1;i=6007" NodeId="ns=1;i=6008" BrowseName="NamespaceUri">
@@ -273,6 +332,118 @@
             <uax:String>http://yourorganisation.org/NodeSetExample/</uax:String>
         </Value>
     </UAVariable>
+    <UAObjectType NodeId="ns=1;i=1003" BrowseName="1:MethodObjectType">
+        <DisplayName>MethodObjectType</DisplayName>
+        <References>
+            <Reference ReferenceType="HasComponent">ns=1;i=7001</Reference>
+            <Reference ReferenceType="HasComponent">ns=1;i=7002</Reference>
+            <Reference ReferenceType="HasSubtype" IsForward="false">i=58</Reference>
+        </References>
+    </UAObjectType>
+    <UAMethod ParentNodeId="ns=1;i=1003" NodeId="ns=1;i=7001" BrowseName="1:Method1">
+        <DisplayName>Method1</DisplayName>
+        <References>
+            <Reference ReferenceType="HasModellingRule">i=78</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1003</Reference>
+        </References>
+    </UAMethod>
+    <UAMethod ParentNodeId="ns=1;i=1003" NodeId="ns=1;i=7002" BrowseName="1:Method2">
+        <DisplayName>Method2</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty">ns=1;i=6018</Reference>
+            <Reference ReferenceType="HasModellingRule">i=78</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=1003</Reference>
+            <Reference ReferenceType="HasProperty">ns=1;i=6020</Reference>
+        </References>
+    </UAMethod>
+    <UAVariable DataType="Argument" ParentNodeId="ns=1;i=7002" ValueRank="1" NodeId="ns=1;i=6018" ArrayDimensions="2" BrowseName="InputArguments">
+        <DisplayName>InputArguments</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=7002</Reference>
+            <Reference ReferenceType="HasModellingRule">i=78</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:ListOfExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P1</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P2</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+            </uax:ListOfExtensionObject>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="Argument" ParentNodeId="ns=1;i=7002" ValueRank="1" NodeId="ns=1;i=6020" ArrayDimensions="2" BrowseName="OutputArguments">
+        <DisplayName>OutputArguments</DisplayName>
+        <References>
+            <Reference ReferenceType="HasModellingRule">i=78</Reference>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=7002</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:ListOfExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P1</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P2</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+            </uax:ListOfExtensionObject>
+        </Value>
+    </UAVariable>
     <UAObjectType NodeId="ns=1;i=1002" BrowseName="1:MyObjectType">
         <DisplayName>MyObjectType</DisplayName>
         <References>
@@ -313,6 +484,8 @@
             <Reference ReferenceType="Organizes">ns=1;i=6005</Reference>
             <Reference ReferenceType="Organizes" IsForward="false">i=85</Reference>
             <Reference ReferenceType="HasTypeDefinition">i=61</Reference>
+            <Reference ReferenceType="Organizes">ns=1;i=5009</Reference>
+            <Reference ReferenceType="Organizes">ns=1;i=6019</Reference>
             <Reference ReferenceType="Organizes">ns=1;i=5005</Reference>
             <Reference ReferenceType="Organizes">ns=1;i=6012</Reference>
         </References>
@@ -337,6 +510,141 @@
             <uax:Int32>0</uax:Int32>
         </Value>
     </UAVariable>
+    <UAObject NodeId="ns=1;i=5009" BrowseName="1:MethodObjectValue">
+        <DisplayName>MethodObjectValue</DisplayName>
+        <References>
+            <Reference ReferenceType="HasComponent">ns=1;i=7003</Reference>
+            <Reference ReferenceType="HasComponent">ns=1;i=7004</Reference>
+            <Reference ReferenceType="HasTypeDefinition">ns=1;i=1003</Reference>
+            <Reference ReferenceType="Organizes" IsForward="false">ns=1;s=Folder</Reference>
+        </References>
+    </UAObject>
+    <UAMethod ParentNodeId="ns=1;i=5009" NodeId="ns=1;i=7003" BrowseName="1:Method1" MethodDeclarationId="ns=1;i=7001">
+        <DisplayName>Method1</DisplayName>
+        <References>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=5009</Reference>
+        </References>
+    </UAMethod>
+    <UAMethod ParentNodeId="ns=1;i=5009" NodeId="ns=1;i=7004" BrowseName="1:Method2" MethodDeclarationId="ns=1;i=7002">
+        <DisplayName>Method2</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty">ns=1;i=6021</Reference>
+            <Reference ReferenceType="HasComponent" IsForward="false">ns=1;i=5009</Reference>
+            <Reference ReferenceType="HasProperty">ns=1;i=6022</Reference>
+        </References>
+    </UAMethod>
+    <UAVariable DataType="Argument" ParentNodeId="ns=1;i=7004" ValueRank="1" NodeId="ns=1;i=6021" ArrayDimensions="2" BrowseName="InputArguments">
+        <DisplayName>InputArguments</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=7004</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:ListOfExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P1</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P2</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+            </uax:ListOfExtensionObject>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="Argument" ParentNodeId="ns=1;i=7004" ValueRank="1" NodeId="ns=1;i=6022" ArrayDimensions="2" BrowseName="OutputArguments">
+        <DisplayName>OutputArguments</DisplayName>
+        <References>
+            <Reference ReferenceType="HasProperty" IsForward="false">ns=1;i=7004</Reference>
+            <Reference ReferenceType="HasTypeDefinition">i=68</Reference>
+        </References>
+        <Value>
+            <uax:ListOfExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P1</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+                <uax:ExtensionObject>
+                    <uax:TypeId>
+                        <uax:Identifier>i=297</uax:Identifier>
+                    </uax:TypeId>
+                    <uax:Body>
+                        <uax:Argument>
+                            <uax:Name>P2</uax:Name>
+                            <uax:DataType>
+                                <uax:Identifier>i=7</uax:Identifier>
+                            </uax:DataType>
+                            <uax:ValueRank>-1</uax:ValueRank>
+                            <uax:ArrayDimensions></uax:ArrayDimensions>
+                            <uax:Description/>
+                        </uax:Argument>
+                    </uax:Body>
+                </uax:ExtensionObject>
+            </uax:ListOfExtensionObject>
+        </Value>
+    </UAVariable>
+    <UAVariable DataType="MyComplexStructureType" NodeId="ns=1;i=6019" BrowseName="1:MyComplexStructureValue" UserAccessLevel="3" AccessLevel="3">
+        <DisplayName>MyComplexStructureValue</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=63</Reference>
+            <Reference ReferenceType="Organizes" IsForward="false">ns=1;s=Folder</Reference>
+        </References>
+        <Value>
+            <uax:ExtensionObject>
+                <uax:TypeId>
+                    <uax:Identifier>ns=1;i=5007</uax:Identifier>
+                </uax:TypeId>
+                <uax:Body>
+                    <MyComplexStructureType xmlns="http://yourorganisation.org/NodeSetExample/Types.xsd">
+                        <Element1>1</Element1>
+                        <Element2>
+                            <EncodingMask>1</EncodingMask>
+                            <Element1>2</Element1>
+                            <Element2>3</Element2>
+                            <Element3>4</Element3>
+                        </Element2>
+                        <Element3>Enum2_1</Element3>
+                    </MyComplexStructureType>
+                </uax:Body>
+            </uax:ExtensionObject>
+        </Value>
+    </UAVariable>
     <UAObject NodeId="ns=1;i=5005" BrowseName="1:MyObjectObject">
         <DisplayName>MyObjectObject</DisplayName>
         <References>
@@ -406,4 +714,20 @@
             <Reference ReferenceType="HasDescription">ns=1;i=6010</Reference>
         </References>
     </UAObject>
+    <UAObject SymbolicName="DefaultBinary" NodeId="ns=1;i=5006" BrowseName="Default Binary">
+        <DisplayName>Default Binary</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3005</Reference>
+            <Reference ReferenceType="HasDescription">ns=1;i=6016</Reference>
+        </References>
+    </UAObject>
+    <UAObject SymbolicName="DefaultXml" NodeId="ns=1;i=5007" BrowseName="Default XML">
+        <DisplayName>Default XML</DisplayName>
+        <References>
+            <Reference ReferenceType="HasTypeDefinition">i=76</Reference>
+            <Reference ReferenceType="HasEncoding" IsForward="false">ns=1;i=3005</Reference>
+            <Reference ReferenceType="HasDescription">ns=1;i=6017</Reference>
+        </References>
+    </UAObject>
 </UANodeSet>
diff --git a/doc/ua/nodesetexample.xsd b/doc/ua/nodesetexample.xsd
index c1d8ac1..d464936 100644
--- a/doc/ua/nodesetexample.xsd
+++ b/doc/ua/nodesetexample.xsd
@@ -28,6 +28,20 @@
         </xs:sequence>
     </xs:complexType>
     <xs:element type="tns:ListOfEnumSimpleType" name="ListOfEnumSimpleType" nillable="true"/>
+    <xs:complexType name="MyComplexStructureType">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="1" type="xs:double" name="Element1"/>
+            <xs:element minOccurs="0" maxOccurs="1" type="tns:MyStructureType" name="Element2"/>
+            <xs:element minOccurs="0" maxOccurs="1" type="tns:EnumSimpleType" name="Element3"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element type="tns:MyComplexStructureType" name="MyComplexStructureType"/>
+    <xs:complexType name="ListOfMyComplexStructureType">
+        <xs:sequence>
+            <xs:element minOccurs="0" maxOccurs="unbounded" type="tns:MyComplexStructureType" name="MyComplexStructureType" nillable="true"/>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element type="tns:ListOfMyComplexStructureType" name="ListOfMyComplexStructureType" nillable="true"/>
     <xs:complexType name="MyStructureType">
         <xs:sequence>
             <xs:element minOccurs="0" type="xs:unsignedInt" name="EncodingMask"/>