diff --git a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet.editor/plugin.xml b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet.editor/plugin.xml
index 7bc3466..1b4ac13 100644
--- a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet.editor/plugin.xml
+++ b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet.editor/plugin.xml
@@ -28,7 +28,7 @@
             id="org.opcfoundation.ua._2011._03.ua.node.set.presentation.SetEditorID"
             name="%_UI_SetEditor_label"
             icon="icons/full/obj16/SetModelFile.gif"
-            extensions="set"
+            extensions="set,xml"
             class="org.opcfoundation.ua._2011._03.ua.node.set.presentation.SetEditor"
             contributorClass="org.opcfoundation.ua._2011._03.ua.node.set.presentation.SetActionBarContributor">
       </editor>
diff --git a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/model/UANodeSet.genmodel b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/model/UANodeSet.genmodel
index 63a3d84..66820d6 100644
--- a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/model/UANodeSet.genmodel
+++ b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/model/UANodeSet.genmodel
@@ -6,7 +6,7 @@
     complianceLevel="5.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
   <foreignModel>file:/C:/Users/user1/Desktop/model-UA/UANodeSet.xsd</foreignModel>
   <genPackages prefix="Set" basePackage="org.opcfoundation.ua._2011._03.ua.node" resource="XML"
-      disposableProviderFactory="true" ecorePackage="set.ecore#/">
+      disposableProviderFactory="true" fileExtensions="set,xml" ecorePackage="set.ecore#/">
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="set.ecore#//DataTypePurpose">
       <genEnumLiterals ecoreEnumLiteral="set.ecore#//DataTypePurpose/Normal"/>
       <genEnumLiterals ecoreEnumLiteral="set.ecore#//DataTypePurpose/ServicesOnly"/>
diff --git a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/plugin.xml b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/plugin.xml
index d72c6cc..bf691c5 100644
--- a/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/plugin.xml
+++ b/at.ac.tuwien.auto.modelua.uml2opcua.emf.UANodeSet/plugin.xml
@@ -19,6 +19,9 @@
       <parser
             type="set"
             class="org.opcfoundation.ua._2011._03.ua.node.set.util.SetResourceFactoryImpl"/>
+      <parser
+            type="xml"
+            class="org.opcfoundation.ua._2011._03.ua.node.set.util.SetResourceFactoryImpl"/>
    </extension>
 
 </plugin>
diff --git a/at.ac.tuwien.auto.modelua.uml2opcua.qvto/src/at/ac/tuwien/auto/modelua/uml2opcua/qvto/Uml2OpcuaTransformer.java b/at.ac.tuwien.auto.modelua.uml2opcua.qvto/src/at/ac/tuwien/auto/modelua/uml2opcua/qvto/Uml2OpcuaTransformer.java
index 1488f8c..55f6b49 100644
--- a/at.ac.tuwien.auto.modelua.uml2opcua.qvto/src/at/ac/tuwien/auto/modelua/uml2opcua/qvto/Uml2OpcuaTransformer.java
+++ b/at.ac.tuwien.auto.modelua.uml2opcua.qvto/src/at/ac/tuwien/auto/modelua/uml2opcua/qvto/Uml2OpcuaTransformer.java
@@ -126,13 +126,6 @@ public boolean serialize(ModelExtent opcUaModel, String opcuaNodesetFilePath, Ou
 		else
 			informationOutputStreamWriter = new PrintWriter(System.out);
 		
-		// Register the SetResourceFactory resource factory  (the OPC UA nodeset resource factory) for the .xml extension
-        Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
-        Map<String, Object> m = reg.getExtensionToFactoryMap();
-        m.put("xml", new SetResourceFactoryImpl());
-        // Object setFactory = m.get("set"); 
-        // m.put("xml", setFactory);
-
         // Obtain a new resource set
         ResourceSet resSet = new ResourceSetImpl();