diff --git a/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsCorrectModelsUnitTest.cs b/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsCorrectModelsUnitTest.cs
index 9b127bc0..8cfb02a5 100644
--- a/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsCorrectModelsUnitTest.cs
+++ b/SemanticData/Tests/USNodeSetValidationUnitTestProject/XMLModelsCorrectModelsUnitTest.cs
@@ -51,6 +51,8 @@ public void UAReferenceTestMethod()
     [TestCategory("Correct Model")]
     public void UAObjectTypeTestMethod()
     {
+      //TODO NetworkIdentifier is missing in generated Model Design for DI model #629
+      //TODO The exported model doesn't contain all nodes #653
       FileInfo _testDataFileInfo = new FileInfo(@"CorrectModels\ObjectTypeTest\ObjectTypeTest.NodeSet2.xml");
       Assert.IsTrue(_testDataFileInfo.Exists);
       List<IUANodeContext> _nodes = ValidateAndExportModelUnitTest(_testDataFileInfo, 85, new UriBuilder("http://cas.eu/UA/CommServer/UnitTests/ObjectTypeTest").Uri);
diff --git a/SemanticData/UANodeSetValidation/UANodeContext.cs b/SemanticData/UANodeSetValidation/UANodeContext.cs
index feb03be3..34db025b 100644
--- a/SemanticData/UANodeSetValidation/UANodeContext.cs
+++ b/SemanticData/UANodeSetValidation/UANodeContext.cs
@@ -172,6 +172,7 @@ void IUANodeBase.CalculateNodeReferences(INodeFactory nodeFactory, IValidator va
             IReferenceFactory _or = nodeFactory.NewReference();
             _or.IsInverse = !_rfx.IsForward;
             _or.ReferenceType = _ReferenceType;
+            //TODO The exported model doesn't contain all nodes #653
             //TODO NetworkIdentifier is missing in generated Model Design for DI model #629
             _or.TargetId = _rfx.BrowsePath();
             switch (_rfx.TargetNode.UANode.NodeClassEnum)
@@ -188,6 +189,7 @@ void IUANodeBase.CalculateNodeReferences(INodeFactory nodeFactory, IValidator va
                 break;
 
               //TODO NetworkIdentifier is missing in generated Model Design for DI model #629
+              //TODO The exported model doesn't contain all nodes #653
               case NodeClassEnum.UAObject:
               case NodeClassEnum.UAVariable:
                 validateExportNode2Model(_rfx.TargetNode);
@@ -307,6 +309,7 @@ public XmlQualifiedName ExportBrowseNameBaseType(Action<NodeId> traceEvent)
     /// </summary>
     /// <returns>An instance of <see cref="NodesCollection"/> or null if there is nothing to return</returns>
     //TODO NetworkIdentifier is missing in generated Model Design for DI model #629
+    //TODOD The exported model doesn't contain all nodes #653
     public NodesCollection GetDerivedInstances()
     {
       if (m_InGetDerivedInstances)
diff --git a/SemanticData/UANodeSetValidation/UAReferenceContext.cs b/SemanticData/UANodeSetValidation/UAReferenceContext.cs
index 18d49b0d..bee4d10c 100644
--- a/SemanticData/UANodeSetValidation/UAReferenceContext.cs
+++ b/SemanticData/UANodeSetValidation/UAReferenceContext.cs
@@ -86,6 +86,7 @@ internal ReferenceKindEnum ReferenceKind
     /// </summary>
     /// <value><c>true</c> if it is child reference; otherwise, <c>false</c>.</value>
     //TODO NetworkIdentifier is missing in generated Model Design for DI model #629
+    //TODO The exported model doesn't contain all nodes #653
     internal bool ChildConnector => (ReferenceKind == ReferenceKindEnum.HasProperty) || (ReferenceKind == ReferenceKindEnum.HasComponent);
 
     #endregion semantics
diff --git a/SemanticData/UANodeSetValidation/Validator.cs b/SemanticData/UANodeSetValidation/Validator.cs
index 0098706d..9463394a 100644
--- a/SemanticData/UANodeSetValidation/Validator.cs
+++ b/SemanticData/UANodeSetValidation/Validator.cs
@@ -159,8 +159,9 @@ private void Update(IVariableInstanceFactory nodeDesign, UAVariable nodeSet, IUA
       try
       {
         Update(nodeDesign, nodeSet, parentReference);
+        //TODO NetworkIdentifier is missing in generated Model Design for DI model #629 parentReference System.NullReferenceException
+        //TODO The exported model doesn't contain all nodes #653
         //if (nodeContext.IsProperty)
-        //  //TODO NetworkIdentifier is missing in generated Model Design for DI model #629 parentReference System.NullReferenceException
         //  m_buildErrorsHandling.WriteTraceMessage(TraceMessage.BuildErrorTraceMessage(BuildError.WrongReference2Variable, string.Format("Creating Variable - wrong reference type {0}", parentReference.ReferenceKind.ToString())));
       }
       catch (Exception _ex)