diff --git a/distribution/distribution.xml b/distribution/distribution.xml
index 08c83ab8..18d9985f 100644
--- a/distribution/distribution.xml
+++ b/distribution/distribution.xml
@@ -1,4 +1,3 @@
-
 <assembly
 	xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/distribution/scripts/analyzewsdl.bat b/distribution/scripts/analyzewsdl.bat
index 68d24868..c828ba43 100644
--- a/distribution/scripts/analyzewsdl.bat
+++ b/distribution/scripts/analyzewsdl.bat
@@ -11,16 +11,18 @@ echo and put it in your path environment variable.
 goto end
 
 :homeOk
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-xml-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
-java  -classpath "%CLASSPATH%" org.membrane_soa.soa_model.analyzer.WSDLAnalyzer %1 %2 %3 %4 %5 %6
+set "SOA_CP=%CLASSPATH%"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-xml-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/slf4j-api-1.7.9.jar"
+java  -classpath "%SOA_CP%" org.membrane_soa.soa_model.analyzer.WSDLAnalyzer %1 %2 %3 %4 %5 %6
 
 :end
\ No newline at end of file
diff --git a/distribution/scripts/analyzewsdl.sh b/distribution/scripts/analyzewsdl.sh
index 73da1812..a1a70ce1 100644
--- a/distribution/scripts/analyzewsdl.sh
+++ b/distribution/scripts/analyzewsdl.sh
@@ -15,16 +15,18 @@ else # if SOA_MODEL_HOME is not set...
 	fi
 fi
 
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-xml-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
-java -classpath "${CLASSPATH}" \
+SOA_CP="${CLASSPATH}"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-xml-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/slf4j-api-1.7.9.jar"
+java -classpath "${SOA_CP}" \
   org.membrane_soa.soa_model.analyzer.WSDLAnalyzer \
   $1 $2 $3 $4 $5 $6
diff --git a/distribution/scripts/create-request-template.bat b/distribution/scripts/create-request-template.bat
index 9b2f722a..4966f237 100644
--- a/distribution/scripts/create-request-template.bat
+++ b/distribution/scripts/create-request-template.bat
@@ -11,16 +11,18 @@ echo and put it in your path environment variable.
 goto end
 
 :homeOk
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-xml-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
-java  -classpath "%CLASSPATH%" org.membrane_soa.soa_model.creator.CreateSOAPRequestTemplate %1 %2 %3 %4 %5 %6
+set "SOA_CP=%CLASSPATH%"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-xml-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/slf4j-api-1.7.9.jar"
+java  -classpath "%SOA_CP%" org.membrane_soa.soa_model.creator.CreateSOAPRequestTemplate %1 %2 %3 %4 %5 %6
 
 :end
\ No newline at end of file
diff --git a/distribution/scripts/create-request-template.sh b/distribution/scripts/create-request-template.sh
index 407a5caf..43268d7e 100644
--- a/distribution/scripts/create-request-template.sh
+++ b/distribution/scripts/create-request-template.sh
@@ -15,16 +15,18 @@ else # if SOA_MODEL_HOME is not set...
 	fi
 fi
 
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-xml-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
-java -classpath "${CLASSPATH}" \
+SOA_CP="${CLASSPATH}"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-xml-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/slf4j-api-1.7.9.jar"
+java -classpath "${SOA_CP}" \
   org.membrane_soa.soa_model.creator.CreateSOAPRequestTemplate \
   $1 $2 $3 $4 $5 $6
diff --git a/distribution/scripts/schemadiff.bat b/distribution/scripts/schemadiff.bat
index 11d181f8..bc54a3f3 100644
--- a/distribution/scripts/schemadiff.bat
+++ b/distribution/scripts/schemadiff.bat
@@ -11,16 +11,18 @@ echo and put it in your path environment variable.
 goto end
 
 :homeOk
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-xml-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
-java  -classpath "%CLASSPATH%" org.membrane_soa.soa_model.diff.SchemaDiffCLI %1 %2 %3 %4 %5 %6
+set "SOA_CP=%CLASSPATH%"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-xml-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/slf4j-api-1.7.9.jar"
+java  -classpath "%SOA_CP%" org.membrane_soa.soa_model.diff.SchemaDiffCLI %1 %2 %3 %4 %5 %6
 
 :end
\ No newline at end of file
diff --git a/distribution/scripts/schemadiff.sh b/distribution/scripts/schemadiff.sh
index bbabecb3..babdb820 100644
--- a/distribution/scripts/schemadiff.sh
+++ b/distribution/scripts/schemadiff.sh
@@ -15,16 +15,18 @@ else # if SOA_MODEL_HOME is not set...
 	fi
 fi
 
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-xml-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
-java -classpath "${CLASSPATH}" \
+SOA_CP="${CLASSPATH}"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-xml-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/slf4j-api-1.7.9.jar"
+java -classpath "${SOA_CP}" \
   org.membrane_soa.soa_model.diff.SchemaDiffCLI \
   $1 $2 $3 $4 $5 $6
diff --git a/distribution/scripts/wsdldiff.bat b/distribution/scripts/wsdldiff.bat
index 2b9d0087..0cc9cb27 100644
--- a/distribution/scripts/wsdldiff.bat
+++ b/distribution/scripts/wsdldiff.bat
@@ -11,16 +11,18 @@ echo and put it in your path environment variable.
 goto end
 
 :homeOk
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/groovy-xml-2.0.4.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
-set "CLASSPATH=%CLASSPATH%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
-java  -classpath "%CLASSPATH%" org.membrane_soa.soa_model.diff.WSDLDiffCLI %1 %2 %3 %4 %5 %6
+set "SOA_CP=%CLASSPATH%"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-distribution-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/soa-model-core-${version}.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-codec-1.6.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpclient-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/httpcore-4.2.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-logging-1.1.1.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/groovy-xml-2.3.9.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/asm-4.0.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/commons-cli-1.2.jar"
+set "SOA_CP=%SOA_CP%;%SOA_MODEL_HOME%/lib/slf4j-api-1.7.9.jar"
+java  -classpath "%SOA_CP%" org.membrane_soa.soa_model.diff.WSDLDiffCLI %1 %2 %3 %4 %5 %6
 
 :end
\ No newline at end of file
diff --git a/distribution/scripts/wsdldiff.sh b/distribution/scripts/wsdldiff.sh
index 3f3c37c8..e74d45f2 100644
--- a/distribution/scripts/wsdldiff.sh
+++ b/distribution/scripts/wsdldiff.sh
@@ -15,16 +15,18 @@ else # if SOA_MODEL_HOME is not set...
 	fi
 fi
 
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/groovy-xml-2.0.4.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
-CLASSPATH="${CLASSPATH}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
-java -classpath "${CLASSPATH}" \
+SOA_CP="${CLASSPATH}"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-distribution-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/soa-model-core-${version}.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-codec-1.6.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpclient-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/httpcore-4.2.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-logging-1.1.1.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/groovy-xml-2.3.9.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/asm-4.0.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/commons-cli-1.2.jar"
+SOA_CP="${SOA_CP}:${SOA_MODEL_HOME}/lib/slf4j-api-1.7.9.jar"
+java -classpath "${SOA_CP}" \
   org.membrane_soa.soa_model.diff.WSDLDiffCLI \
   $1 $2 $3 $4 $5 $6