diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java
index a1658abf5..1488082ed 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSIns.java
@@ -16,11 +16,20 @@
  */
 package com.jpexs.asdec.abc.avm2.instructions.xml;
 
+import com.jpexs.asdec.abc.ABC;
 import com.jpexs.asdec.abc.avm2.AVM2Code;
 import com.jpexs.asdec.abc.avm2.ConstantPool;
 import com.jpexs.asdec.abc.avm2.LocalDataArea;
+import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition;
+import com.jpexs.asdec.abc.avm2.treemodel.DefaultXMLNamespace;
+import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem;
+import com.jpexs.asdec.abc.avm2.treemodel.TreeItem;
+import com.jpexs.asdec.abc.types.MethodBody;
+import com.jpexs.asdec.abc.types.MethodInfo;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Stack;
 
 public class DXNSIns extends InstructionDefinition {
 
@@ -35,4 +44,9 @@ public class DXNSIns extends InstructionDefinition {
       System.out.println("Set default XML space " + s);
 
    }
+
+   @Override
+   public void translate(boolean isStatic, int classIndex, HashMap<Integer, TreeItem> localRegs, Stack<TreeItem> stack, Stack<TreeItem> scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List<TreeItem> output, MethodBody body, ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
+      output.add(new DefaultXMLNamespace(ins, new StringTreeItem(ins, constants.constant_string[ins.operands[0]])));
+   }
 }
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java
index 774a0f56c..aa4dbe9b9 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/DXNSLateIns.java
@@ -21,6 +21,8 @@ import com.jpexs.asdec.abc.avm2.ConstantPool;
 import com.jpexs.asdec.abc.avm2.LocalDataArea;
 import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition;
+import com.jpexs.asdec.abc.avm2.treemodel.DefaultXMLNamespace;
+import com.jpexs.asdec.abc.avm2.treemodel.StringTreeItem;
 import com.jpexs.asdec.abc.avm2.treemodel.TreeItem;
 import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem;
 import com.jpexs.asdec.abc.types.MethodInfo;
@@ -43,7 +45,8 @@ public class DXNSLateIns extends InstructionDefinition {
    @Override
    public void translate(boolean isStatic, int classIndex, java.util.HashMap<Integer, TreeItem> localRegs, Stack<TreeItem> stack, java.util.Stack<TreeItem> scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List<TreeItem> output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
       TreeItem xmlns = stack.pop();
-      stack.push(new UnparsedTreeItem(ins, "XMLNS:" + xmlns.toString(constants, localRegNames, fullyQualifiedNames)));
+      output.add(new DefaultXMLNamespace(ins, xmlns));
+
    }
 
    @Override
diff --git a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java
index b51136ca3..71850cb59 100644
--- a/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java
+++ b/trunk/src/com/jpexs/asdec/abc/avm2/instructions/xml/EscXAttrIns.java
@@ -21,6 +21,7 @@ import com.jpexs.asdec.abc.avm2.ConstantPool;
 import com.jpexs.asdec.abc.avm2.LocalDataArea;
 import com.jpexs.asdec.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.asdec.abc.avm2.instructions.InstructionDefinition;
+import com.jpexs.asdec.abc.avm2.treemodel.EscapeXAttrTreeItem;
 import com.jpexs.asdec.abc.avm2.treemodel.TreeItem;
 import com.jpexs.asdec.abc.avm2.treemodel.UnparsedTreeItem;
 import com.jpexs.asdec.abc.types.MethodInfo;
@@ -43,7 +44,7 @@ public class EscXAttrIns extends InstructionDefinition {
 
    @Override
    public void translate(boolean isStatic, int classIndex, java.util.HashMap<Integer, TreeItem> localRegs, Stack<TreeItem> stack, java.util.Stack<TreeItem> scopeStack, ConstantPool constants, AVM2Instruction ins, MethodInfo[] method_info, List<TreeItem> output, com.jpexs.asdec.abc.types.MethodBody body, com.jpexs.asdec.abc.ABC abc, HashMap<Integer, String> localRegNames, List<String> fullyQualifiedNames) {
-      stack.push(new UnparsedTreeItem(ins, "esc_xattr(" + stack.pop().toString(constants, localRegNames, fullyQualifiedNames) + ")"));
+      stack.push(new EscapeXAttrTreeItem(ins, stack.pop()));
    }
 
    @Override