diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
index 6d949edd..0ef6070a 100755
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/application/BWEARPackagerMojo.java
@@ -1,27 +1,12 @@
 package com.tibco.bw.maven.plugin.application;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.commons.io.FileUtils;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
+import com.tibco.bw.maven.plugin.osgi.helpers.Version;
+import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
+import com.tibco.bw.maven.plugin.utils.BWModulesParser;
+import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
+import com.tibco.bw.maven.plugin.utils.Constants;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -32,11 +17,7 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionResult;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectDependenciesResolver;
+import org.apache.maven.project.*;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.eclipse.aether.graph.Dependency;
@@ -45,13 +26,19 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
-import com.tibco.bw.maven.plugin.osgi.helpers.Version;
-import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
-import com.tibco.bw.maven.plugin.utils.BWModulesParser;
-import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
-import com.tibco.bw.maven.plugin.utils.Constants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileOutputStream;
+import java.util.*;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 @Mojo(name = "bwear", defaultPhase = LifecyclePhase.PACKAGE)
 public class BWEARPackagerMojo extends AbstractMojo {
@@ -182,13 +169,14 @@ private void addModules() throws Exception {
                 File moduleJar = artifact.getFile();
                 
 				Manifest mf = ManifestParser.parseManifestFromJAR( moduleJar );
-				if( mf.getMainAttributes().containsKey("TIBCO-BW-SharedModule") )
+				if( ManifestParser.isSharedModule(mf) )
 				{
+					getLog().debug("Adding Artifact JAR with name " + artifact.getArtifactId() + " with version " + artifact.getBaseVersion());
 	                jarchiver.addFile(moduleJar, artifact.getArtifactId()+ "_" + artifact.getBaseVersion()+ ".jar");
-
 				}
 				else
 				{
+					getLog().debug("Adding JAR file with name " + moduleJar.getName());
 					jarchiver.addFile(moduleJar, moduleJar.getName());
 				}
 
@@ -231,18 +219,10 @@ private void addModules() throws Exception {
     				String dependencyVersion = BWProjectUtils.getModuleVersion(artifact.getFile());
     				
     				Manifest mf = ManifestParser.parseManifestFromJAR( f);
-    				for( Object str : mf.getMainAttributes().keySet())
-    				{
-    					getLog().debug( str.toString() );
-    					if( "TIBCO-BW-SharedModule".equals(str.toString() ))
-    					{
-    	    				moduleVersionMap.put(artifact.getArtifactId(), dependencyVersion);
-    						artifactFiles.add(artifact.getFile());
-    						break;
-    						
-    					}
-    				}
-    				
+					if(ManifestParser.isSharedModule(mf)) {
+						moduleVersionMap.put(artifact.getArtifactId(), dependencyVersion);
+						artifactFiles.add(artifact.getFile());
+					}
     			}
     		}
     		
@@ -261,17 +241,10 @@ private void addModules() throws Exception {
 	    			Manifest mf = ManifestParser.parseManifestFromJAR( dependency.getArtifact().getFile() );
 	    			
     				if(mf !=null){
-						for( Object str : mf.getMainAttributes().keySet())
-						{
-							getLog().debug( str.toString() );
-							if( "TIBCO-BW-SharedModule".equals(str.toString() ))
-							{
-								String dependencyVersion = BWProjectUtils.getModuleVersion(dependency.getArtifact().getFile());
-								moduleVersionMap.put(dependency.getArtifact().getArtifactId(), dependencyVersion);
-								artifactFiles.add(dependency.getArtifact().getFile());
-								break;
-								
-							}
+    					if(ManifestParser.isSharedModule(mf)) {
+							String dependencyVersion = BWProjectUtils.getModuleVersion(dependency.getArtifact().getFile());
+							moduleVersionMap.put(dependency.getArtifact().getArtifactId(), dependencyVersion);
+							artifactFiles.add(dependency.getArtifact().getFile());
 						}
     				}
 
@@ -560,7 +533,7 @@ private void cleanup() {
     private void updateManifestVersion() {
     	String version = manifest.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
     	String qualifierVersion = VersionParser.getcalculatedOSGiVersion(version, Constants.TIMESTAMP);
-    	getLog().info("The OSGi verion is " + qualifierVersion + " for Maven version of " + version);
+    	getLog().info("The OSGi version is " + qualifierVersion + " for Maven version of " + version);
     	manifest.getMainAttributes().putValue(Constants.BUNDLE_VERSION, qualifierVersion);
     }
 }
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java
index b3242804..8b820c79 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/module/BWModulePackageMojo.java
@@ -1,14 +1,11 @@
 package com.tibco.bw.maven.plugin.module;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.Manifest;
-
+import com.tibco.bw.maven.plugin.build.BuildProperties;
+import com.tibco.bw.maven.plugin.build.BuildPropertiesParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
+import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
+import com.tibco.bw.maven.plugin.utils.Constants;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -21,11 +18,7 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionResult;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectDependenciesResolver;
+import org.apache.maven.project.*;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
 import org.apache.maven.shared.dependency.graph.DependencyNode;
@@ -38,14 +31,13 @@
 import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.eclipse.aether.graph.Dependency;
 
-import com.tibco.bw.maven.plugin.build.BuildProperties;
-import com.tibco.bw.maven.plugin.build.BuildPropertiesParser;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.jar.Manifest;
+
 //import com.tibco.bw.maven.plugin.classpath.ClassPathFile;
 //import com.tibco.bw.maven.plugin.classpath.ClassPathFileParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
-import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
-import com.tibco.bw.maven.plugin.utils.Constants;
 
 @Mojo(name = "bwmodule", defaultPhase = LifecyclePhase.PACKAGE)
 public class BWModulePackageMojo extends AbstractMojo {
@@ -195,15 +187,8 @@ private void addDependencies() throws Exception {
 			if(mf == null){
 				throw new Exception("Failed to get Manifest for - "+ file.getName() +". Please verify if jar file is valid, the MANIFEST.MF should be first or second entry in the jar file. Use Command - jar tf <Jar_File_Path> to verify.");
 			}
-			for( Object str : mf.getMainAttributes().keySet())
-			{
-				getLog().debug( str.toString() );
-				if( Constants.TIBCO_SHARED_MODULE.equals(str.toString() ))
-				{
-					isSharedModule = true;
-					break;
-				}
-			}
+			isSharedModule = ManifestParser.isSharedModule(mf);
+
 			if(!isSharedModule) {
 				getLog().debug("Dependency added with name " + file.toString());
 				jarArchiver.addFile(file, "lib/" + file.getName());
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/osgi/helpers/ManifestParser.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/osgi/helpers/ManifestParser.java
index 2b3220ef..2ca50f4d 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/osgi/helpers/ManifestParser.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/osgi/helpers/ManifestParser.java
@@ -1,15 +1,11 @@
 package com.tibco.bw.maven.plugin.osgi.helpers;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import com.tibco.bw.maven.plugin.utils.Constants;
+
+import java.io.*;
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import com.tibco.bw.maven.plugin.utils.Constants;
-
 public class ManifestParser {
 
 	public static Manifest parseManifest(File baseDir) {
@@ -96,4 +92,10 @@ public static String getUpdatedProvideCapabilities(Manifest manifest, String old
 		
 		return updatedProvidesCapabilities;
 	}
+
+	public static boolean isSharedModule(Manifest mf) {
+
+		//mf.getMainAttributes().containsKey() require an Object not a String and don't return right value
+		return (mf.getMainAttributes().getValue(Constants.TIBCO_SHARED_MODULE) != null);
+	}
 }
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWEARTestPackagerMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWEARTestPackagerMojo.java
index 48ed39f0..3b96f0bc 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWEARTestPackagerMojo.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWEARTestPackagerMojo.java
@@ -1,27 +1,12 @@
 package com.tibco.bw.maven.plugin.test.setupenterprise;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.commons.io.FileUtils;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
+import com.tibco.bw.maven.plugin.osgi.helpers.Version;
+import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
+import com.tibco.bw.maven.plugin.utils.BWModulesParser;
+import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
+import com.tibco.bw.maven.plugin.utils.Constants;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
@@ -32,11 +17,7 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionResult;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectDependenciesResolver;
+import org.apache.maven.project.*;
 import org.codehaus.plexus.archiver.jar.JarArchiver;
 import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.eclipse.aether.graph.Dependency;
@@ -45,13 +26,19 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
-import com.tibco.bw.maven.plugin.osgi.helpers.Version;
-import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
-import com.tibco.bw.maven.plugin.utils.BWModulesParser;
-import com.tibco.bw.maven.plugin.utils.BWProjectUtils;
-import com.tibco.bw.maven.plugin.utils.Constants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileOutputStream;
+import java.util.*;
+import java.util.jar.Attributes;
+import java.util.jar.Manifest;
 
 @Mojo(name = "bwtestear", defaultPhase = LifecyclePhase.GENERATE_TEST_RESOURCES)
 public class BWEARTestPackagerMojo extends AbstractMojo {
@@ -182,10 +169,9 @@ private void addModules() throws Exception {
                 File moduleJar = artifact.getFile();
                 
 				Manifest mf = ManifestParser.parseManifestFromJAR( moduleJar );
-				if( mf.getMainAttributes().containsKey("TIBCO-BW-SharedModule") )
+				if( ManifestParser.isSharedModule(mf) )
 				{
 	                jarchiver.addFile(moduleJar, artifact.getArtifactId()+ "_" + artifact.getBaseVersion()+ ".jar");
-
 				}
 				else
 				{
@@ -231,18 +217,10 @@ private void addModules() throws Exception {
     				String dependencyVersion = BWProjectUtils.getModuleVersion(artifact.getFile());
     				
     				Manifest mf = ManifestParser.parseManifestFromJAR( f);
-    				for( Object str : mf.getMainAttributes().keySet())
-    				{
-    					getLog().debug( str.toString() );
-    					if( "TIBCO-BW-SharedModule".equals(str.toString() ))
-    					{
-    	    				moduleVersionMap.put(artifact.getArtifactId(), dependencyVersion);
-    						artifactFiles.add(artifact.getFile());
-    						break;
-    						
-    					}
-    				}
-    				
+    				if(ManifestParser.isSharedModule(mf)) {
+						moduleVersionMap.put(artifact.getArtifactId(), dependencyVersion);
+						artifactFiles.add(artifact.getFile());
+					}
     			}
     		}
     		
@@ -260,17 +238,10 @@ private void addModules() throws Exception {
 	    			
 	    			Manifest mf = ManifestParser.parseManifestFromJAR( dependency.getArtifact().getFile() );
 	    			
-    				for( Object str : mf.getMainAttributes().keySet())
-    				{
-    					getLog().debug( str.toString() );
-    					if( "TIBCO-BW-SharedModule".equals(str.toString() ))
-    					{
-    		    			String dependencyVersion = BWProjectUtils.getModuleVersion(dependency.getArtifact().getFile());
-    		                moduleVersionMap.put(dependency.getArtifact().getArtifactId(), dependencyVersion);
-    						artifactFiles.add(dependency.getArtifact().getFile());
-    						break;
-    						
-    					}
+    				if(ManifestParser.isSharedModule(mf)) {
+						String dependencyVersion = BWProjectUtils.getModuleVersion(dependency.getArtifact().getFile());
+						moduleVersionMap.put(dependency.getArtifact().getArtifactId(), dependencyVersion);
+						artifactFiles.add(dependency.getArtifact().getFile());
     				}
 
 	        	}
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWModuleTestPackageMojo.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWModuleTestPackageMojo.java
index 9df04958..15849790 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWModuleTestPackageMojo.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/test/setupenterprise/BWModuleTestPackageMojo.java
@@ -1,19 +1,15 @@
 package com.tibco.bw.maven.plugin.test.setupenterprise;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.Manifest;
-
+import com.tibco.bw.maven.plugin.build.BuildProperties;
+import com.tibco.bw.maven.plugin.build.BuildPropertiesParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
+import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
+import com.tibco.bw.maven.plugin.utils.Constants;
 import org.apache.maven.archiver.MavenArchiveConfiguration;
 import org.apache.maven.archiver.MavenArchiver;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DependencyResolutionRequiredException;
-import org.apache.maven.artifact.resolver.filter.TypeArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -21,15 +17,8 @@
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
-import org.apache.maven.project.DefaultDependencyResolutionRequest;
-import org.apache.maven.project.DependencyResolutionException;
-import org.apache.maven.project.DependencyResolutionResult;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectDependenciesResolver;
+import org.apache.maven.project.*;
 import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
-import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
-import org.apache.maven.shared.dependency.graph.DependencyNode;
-import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
 import org.codehaus.plexus.archiver.Archiver;
 import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.FileSet;
@@ -38,14 +27,13 @@
 import org.codehaus.plexus.archiver.util.DefaultFileSet;
 import org.eclipse.aether.graph.Dependency;
 
-import com.tibco.bw.maven.plugin.build.BuildProperties;
-import com.tibco.bw.maven.plugin.build.BuildPropertiesParser;
+import java.io.File;
+import java.io.IOException;
+import java.util.*;
+import java.util.jar.Manifest;
+
 //import com.tibco.bw.maven.plugin.classpath.ClassPathFile;
 //import com.tibco.bw.maven.plugin.classpath.ClassPathFileParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestWriter;
-import com.tibco.bw.maven.plugin.osgi.helpers.VersionParser;
-import com.tibco.bw.maven.plugin.utils.Constants;
 
 @Mojo(name = "bwtestmodule", defaultPhase = LifecyclePhase.GENERATE_TEST_RESOURCES)
 public class BWModuleTestPackageMojo extends AbstractMojo {
@@ -186,17 +174,11 @@ private void addDependencies() {
 				continue;
 			}
 			
-			
 			Manifest mf = ManifestParser.parseManifestFromJAR( file);
-			for( Object str : mf.getMainAttributes().keySet())
-			{
-				getLog().debug( str.toString() );
-				if( "TIBCO-BW-SharedModule".equals(str.toString() ))
-				{
-					continue;
-					
-				}
+			if(ManifestParser.isSharedModule(mf)) {
+				continue;
 			}
+
 			getLog().debug("Dependency added with name " + file.toString());
 			jarArchiver.addFile(file, "lib/" + file.getName());
 			buffer.append(",lib/" + file.getName());
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/BWProjectUtils.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/BWProjectUtils.java
index ddee6ba6..1377a3eb 100755
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/BWProjectUtils.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/BWProjectUtils.java
@@ -1,5 +1,10 @@
 package com.tibco.bw.maven.plugin.utils;
 
+import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.List;
@@ -7,12 +12,6 @@
 import java.util.jar.JarInputStream;
 import java.util.jar.Manifest;
 
-import org.apache.maven.execution.MavenSession;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.project.MavenProject;
-
-import com.tibco.bw.maven.plugin.osgi.helpers.ManifestParser;
-
 public class BWProjectUtils {
 	public enum OS {
 		WINDOWS, UNIX
@@ -54,14 +53,14 @@ public static MODULE getModuleType(Manifest manifest){
 		if(manifest != null){
 			Attributes attributes = manifest.getMainAttributes();
 			
-			if( attributes.getValue("TIBCO-BW-ApplicationModule") != null){
+			if( attributes.getValue(Constants.TIBCO_APPLICATION) != null){
 				return MODULE.APPMODULE;
 			}
 			
-			else if( attributes.getValue("TIBCO-BW-SharedModule") != null){
+			else if( attributes.getValue(Constants.TIBCO_SHARED_MODULE) != null){
 				return MODULE.SHAREDMODULE;	
 			}
-			else if( attributes.getValue("TIBCO-BW-Application") != null){
+			else if( attributes.getValue(Constants.TIBCO_APPLICATION_MODULE) != null){
 				return MODULE.APPLICATION;
 			}
 		}
diff --git a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/Constants.java b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/Constants.java
index 3d50050a..12091def 100644
--- a/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/Constants.java
+++ b/Source/bw6-maven-plugin/src/main/java/com/tibco/bw/maven/plugin/utils/Constants.java
@@ -15,6 +15,8 @@ public interface Constants {
 	public static final String BASIC_AUTH = "BASIC";
 	public static final String DIGEST_AUTH = "DIGEST";
 	public static final String TIBCO_SHARED_MODULE = "TIBCO-BW-SharedModule";
+	public static final String TIBCO_APPLICATION = "TIBCO-BW-Application";
+	public static final String TIBCO_APPLICATION_MODULE = "TIBCO-BW-ApplicationModule";
 	public static final String TEMP_SUBSTVAR= "external.substvar";
 	public static final String TIMESTAMP= "timestamp";
 	public static final String COMPONENT_PROCESS = "ComponentProcess";