diff --git a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java
index b3f7c2a..41b56fe 100644
--- a/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java
+++ b/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/AuthoringUIService.java
@@ -28,7 +28,9 @@
 import org.eclipse.epf.library.edit.IConfigurator;
 import org.eclipse.epf.library.edit.IConfiguratorFactory;
 import org.eclipse.epf.library.edit.Providers;
+import org.eclipse.epf.library.edit.TngAdapterFactory;
 import org.eclipse.epf.library.edit.command.MethodElementAddCommand;
+import org.eclipse.epf.library.edit.util.ConfigurableComposedAdapterFactory;
 import org.eclipse.epf.library.ui.LibraryUIUtil;
 import org.eclipse.epf.library.ui.preferences.LibraryUIPreferences;
 import org.eclipse.epf.library.util.CopyAttachmentsToNewLocation;
@@ -96,6 +98,14 @@
 
 			// Initialize ProcessAuthoringConfigurator
 			ProcessAuthoringConfigurator.INSTANCE.getClass();
+			
+			// Set configurator for WBS adapter factory if it's not set yet
+			if(TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory() instanceof ConfigurableComposedAdapterFactory) {
+				ConfigurableComposedAdapterFactory adapterFactory = (ConfigurableComposedAdapterFactory) TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory();
+				if(adapterFactory.getFilter() == null) {
+					adapterFactory.setFilter(ProcessAuthoringConfigurator.INSTANCE);
+				}
+			}
 
 			// Initialize the move/paste command.
 			MethodElementAddCommand
diff --git a/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/process/command/ActivityDeepCopyCommand.java b/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/process/command/ActivityDeepCopyCommand.java
index dea14ed..3f4d38a 100644
--- a/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/process/command/ActivityDeepCopyCommand.java
+++ b/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/process/command/ActivityDeepCopyCommand.java
@@ -97,7 +97,7 @@
 		 * @param commandStack
 		 */
 		public EditingDomain() {
-			super(TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory(), new BasicCommandStack()); 
+			super(TngAdapterFactory.INSTANCE.getWBS_ComposedAdapterFactory(), new BasicCommandStack());
 		}
 		
 		/* (non-Javadoc)