diff --git a/build/classes/xid/Presenter.class b/build/classes/xid/Presenter.class
index 2dc6bc9..bc99068 100644
Binary files a/build/classes/xid/Presenter.class and b/build/classes/xid/Presenter.class differ
diff --git a/dist/xid.jar b/dist/xid.jar
index 532c1fc..4e752e3 100644
Binary files a/dist/xid.jar and b/dist/xid.jar differ
diff --git a/src/xid/Presenter.java b/src/xid/Presenter.java
index e812476..280bba9 100644
--- a/src/xid/Presenter.java
+++ b/src/xid/Presenter.java
@@ -263,42 +263,6 @@ public class Presenter
   }
 
 
-
-  /**
-   *
-   */
-  static public Attributes getNamedTagAttributes (TagsDataById datas, String name)
-  {
-    Attributes result;
-
-    if ((name == null) || (datas == null))
-      {
-	result = null;
-      }
-    else
-      {
-	TagDataCore dataCore = datas.getId ("<" + name + ">");
-	if (dataCore == null)
-	  {
-	    result = null;
-	  }
-	else if (!(dataCore instanceof TagData))
-	  {
-	    result = null;
-	  }
-	else
-	  {
-	    TagData data = (TagData) dataCore;
-
-	    result = data.getAttributes ();
-	  }
-      }
-
-    //
-    return (result);
-  }
-
-
   /**
    *
    */
@@ -705,7 +669,7 @@ public class Presenter
 	    result.append (node.getNodeName());
 	    
 	    // Build attributes.
-	    result.append (processAttributes (attrs, data.getAttributes (), getNamedTagAttributes (datas, node.getNodeName ()), prefix));
+	    result.append (processAttributes (attrs, data.getAttributes (), datas.getNamedTagAttributes (node.getNodeName ()), prefix));
 	    
 	    if ((node.getChildNodes () == null) &&
 		((data == null) || data.display ().equals ("")))
@@ -751,7 +715,7 @@ public class Presenter
 		result.append (node.getNodeName());
 		
 		// Build attributes.
-		result.append (processAttributes (attrs, data.getAttributes (), getNamedTagAttributes (datas, node.getNodeName ()), Integer.toString (nLine)));
+		result.append (processAttributes (attrs, data.getAttributes (), datas.getNamedTagAttributes (node.getNodeName ()), Integer.toString (nLine)));
 		
 		if ((node.getChildNodes () == null) &&
 		    ((data == null) || data.display ().equals ("")))
@@ -974,7 +938,7 @@ public class Presenter
     
     // Build the tag attributes.
     result.append (processAttributes (node.getAttributes (),
-				      getNamedTagAttributes (datas, node.getNodeName ()),
+				      datas.getNamedTagAttributes (node.getNodeName ()),
 				      null,
 				      prefix));
 
diff --git a/src/xid/TagsDataById.java b/src/xid/TagsDataById.java
index 4af3708..6975cc0 100644
--- a/src/xid/TagsDataById.java
+++ b/src/xid/TagsDataById.java
@@ -36,4 +36,39 @@ public class TagsDataById extends HashMap<String, TagDataCore> implements TagDat
     //
     return (result);
   }
+
+
+  /*
+   *
+   */
+  public Attributes getNamedTagAttributes (String name)
+  {
+    Attributes result;
+
+    if (name == null)
+      {
+	result = null;
+      }
+    else
+      {
+	TagDataCore dataCore = this.getId ("<" + name + ">");
+	if (dataCore == null)
+	  {
+	    result = null;
+	  }
+	else if (!(dataCore instanceof TagData))
+	  {
+	    result = null;
+	  }
+	else
+	  {
+	    TagData data = (TagData) dataCore;
+
+	    result = data.getAttributes ();
+	  }
+      }
+
+    //
+    return (result);
+  }
 }