diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
index 8f361f4..8048f61 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
@@ -12,7 +12,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
 import org.apache.xerces.dom.DocumentImpl;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.viewers.DoubleClickEvent;
@@ -57,10 +56,6 @@
 
 public class AddExtensionsComponentDialog extends SelectionDialog implements ISelectionChangedListener, SelectionListener
 {
-  // when this dialog is created it needs to know which registry it is going to use,the WSDL or the XSD,
-  // hence we need this field
-  static ExtensionsSchemasRegistry registry;
-  
   protected static final Image DEFAULT_ELEMENT_ICON = XSDEditorPlugin.getXSDImage("icons/XSDElement.gif"); //$NON-NLS-1$
   protected static final Image DEFAULT_ATTRIBUTE_ICON = XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif"); //$NON-NLS-1$
 
@@ -74,9 +69,7 @@
   {
     super(parent);
     setTitle(Messages._UI_ACTION_ADD_EXTENSION_COMPONENTS);
-    setShellStyle(SWT.APPLICATION_MODAL | SWT.RESIZE | SWT.CLOSE);
-    
-    registry = schemaRegistry;
+    setShellStyle(SWT.APPLICATION_MODAL | SWT.RESIZE | SWT.CLOSE);    
   }
 
   private List fInput;
@@ -529,8 +522,8 @@
     }
   }
 
-  static class ElementLabelProvider extends LabelProvider
-  {
+  class ElementLabelProvider extends LabelProvider
+  {    
     /*
      * (non-Javadoc)
      * 
@@ -545,7 +538,7 @@
     	  String namespace = ((XSDElementDeclaration) element).getSchema().getTargetNamespace();
     	  String name = ((XSDElementDeclaration) element).getName();
     	  Element tempElement = tempDoc.createElementNS(namespace, name);
-    	  ILabelProvider lp = registry.getLabelProvider(tempElement);
+          ILabelProvider lp = XSDEditorPlugin.getDefault().getNodeCustomizationRegistry().getLabelProvider(namespace);
     	  if (lp != null){
     		  Image img = lp.getImage(tempElement);
     		  
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java
index e98cd22..cec15bd 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java
@@ -3,6 +3,7 @@
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeCustomizationRegistry;
 import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
@@ -18,16 +19,20 @@
   
   public Image getImage(Object element)
   {
-    ExtensionsSchemasRegistry registry = XSDEditorPlugin.getDefault().getExtensionsSchemasRegistry();
+    NodeCustomizationRegistry registry = XSDEditorPlugin.getDefault().getNodeCustomizationRegistry();
     if (element instanceof Element)
     {
       Element domElement = (Element) element;
-      ILabelProvider lp = registry.getLabelProvider(domElement);
-      if (lp != null)
-      {
-        Image img = lp.getImage(domElement);
-        if (img != null)
-          return img;
+      String namespace = domElement.getNamespaceURI();
+      if (namespace != null)
+      {  
+        ILabelProvider lp = registry.getLabelProvider(namespace);
+        if (lp != null)
+        {
+          Image img = lp.getImage(domElement);
+          if (img != null)
+            return img;
+        }  
       }
       return DEFAULT_ELEMENT_ICON;
     }
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java
index 4b9c40e..645bb54 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java
@@ -136,8 +136,11 @@
     return nsURIProperties;
   }
 
+  /**
+   * @deprecated
+   */
   public ILabelProvider getLabelProvider(Element element)
-  {
+  {/*
     String uri = element.getNamespaceURI();
     if (uri == null)
       uri = ""; //$NON-NLS-1$
@@ -152,7 +155,7 @@
     if (object instanceof ILabelProvider)
     {
       return (ILabelProvider) object;
-    }
+    }*/
     return null;
   }
 
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java
index 2548a2c..1189a4a 100644
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java
+++ b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java
@@ -13,11 +13,12 @@
 import java.util.HashMap;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.ILabelProvider;
 
 public class NodeCustomizationRegistry
 {
   private static final String NAMESPACE = "namespace"; //$NON-NLS-1$  
-  //private static final String LABEL_PROVIDER_ATTRIBUTE_NAME = "labelProvider"; //$NON-NLS-1$    
+  private static final String LABEL_PROVIDER_CLASS_ATTRIBUTE_NAME = "labelProviderClass";     
   private static final String NODE_EDITOR_PROVIDER_CLASS_ATTRIBUTE_NAME = "nodeEditorProviderClass"; //$NON-NLS-1$
 
 
@@ -35,9 +36,7 @@
     
     NodeEditorProvider nodeEditorProvider;
     boolean nodeEditorProviderFailedToLoad = false;
-    
-    //LabelProvider labelProvider;
-    //boolean labelProviderFailedToLoad = false;
+    boolean labelProviderFailedToLoad = false;
     
     Descriptor(IConfigurationElement element)
     {
@@ -59,6 +58,22 @@
       } 
       return nodeEditorProvider;
     }
+    
+    ILabelProvider createLabelProvider()
+    {
+      if (!labelProviderFailedToLoad)
+      {  
+        try
+        {
+          return (ILabelProvider)configurationElement.createExecutableExtension(LABEL_PROVIDER_CLASS_ATTRIBUTE_NAME);
+        }
+        catch (Exception e) 
+        {
+          labelProviderFailedToLoad = true;
+        }
+      }
+      return null;
+    }
   }
 
   
@@ -78,8 +93,8 @@
     return theMap;
   }
 
-  public NodeEditorProvider getNodeEditorProvider(String namespace)
-  {     
+  private Descriptor getDescriptor(String namespace)
+  {
     map = null;
     if (namespace != null)
     { 
@@ -87,12 +102,28 @@
       {  
         map = initMap();
       }  
-      Descriptor descriptor = (Descriptor)map.get(namespace);
-      if (descriptor != null)
-      {  
-        return descriptor.lookupOrCreateNodeEditorProvider();    
-      }
+      return (Descriptor)map.get(namespace);
+    }
+    return null;     
+  }
+  
+  public NodeEditorProvider getNodeEditorProvider(String namespace)
+  {     
+    Descriptor descriptor = getDescriptor(namespace);
+    if (descriptor != null)
+    {  
+      return descriptor.lookupOrCreateNodeEditorProvider();       
     }
     return null;
   }
+  
+  public ILabelProvider getLabelProvider(String namespace)
+  {
+    Descriptor descriptor = getDescriptor(namespace);
+    if (descriptor != null)
+    {  
+      return descriptor.createLabelProvider();       
+    }
+    return null;    
+  }
 }