diff --git a/plugins/com.ibm.ffdc.jar b/plugins/com.ibm.ffdc.jar
new file mode 100644
index 0000000..e356084
Binary files /dev/null and b/plugins/com.ibm.ffdc.jar differ
diff --git a/xmlaccess.bat b/xmlaccess.bat
index 68fc5fa..b8c63c9 100755
--- a/xmlaccess.bat
+++ b/xmlaccess.bat
@@ -1,25 +1,16 @@
 @echo off
 
-set WPS_HOME=@WpsInstallLocation@
-set WAS_HOME=@WasInstallLocation@
+set cpath=.\plugins\com.ibm.ws.runtime.jar
+set cpath=%cpath%;.\lib\bootstrap.jar
+set cpath=%cpath%;.\plugins\com.ibm.ws.emf.jar
+set cpath=%cpath%;.\plugins\org.eclipse.emf.ecore.jar
+set cpath=%cpath%;.\plugins\org.eclipse.emf.common.jar
 
-REM Set JAVA_HOME
-REM Check SDK setting in the profile first.  If not available, set SDK from WAS binary tree.
-set MY_CWD=%CD%
-cd /d %~dp0
-if exist "..\..\bin\sdk\_setupSdk.bat" (
-    call ..\..\bin\sdk\_setupSdk.bat
-) else (
-    cd /d "%WAS_HOME%\bin\sdk"
-    call "%WAS_HOME%\bin\sdk\_setupSdk.bat"
-)
+set cpath=%cpath%;.\base\wp.xml.client.jar
+set cpath=%cpath%;.\base\wp.base.jar
+set cpath=%cpath%;.\base\wp.engine.impl.jar
+set cpath=%cpath%;.\base\wp.utilities.streams.jar
+set cpath=%cpath%;.\lib\j2ee.jar
+set cpath=%cpath%;.\plugins\com.ibm.ffdc.jar
 
-set cpath=%WAS_HOME%\plugins\com.ibm.ws.runtime.jar
-set cpath=%cpath%;%WAS_HOME%\lib\bootstrap.jar
-set cpath=%cpath%;%WAS_HOME%\plugins\com.ibm.ws.emf.jar
-set cpath=%cpath%;%WAS_HOME%\plugins\org.eclipse.emf.ecore.jar
-set cpath=%cpath%;%WAS_HOME%\plugins\org.eclipse.emf.common.jar
-
-cd /d %MY_CWD%
-
-"%JAVA_HOME%\bin\java" -classpath "%WPS_HOME%\base\wp.xml.client\bin\wp.xml.client.jar;%WPS_HOME%\base\wp.base\shared\app\wp.base.jar;%WPS_HOME%\base\wp.engine.impl\shared\app\wp.engine.impl.jar;%WPS_HOME%\base\wp.utilities.streams\shared\app\wp.utilities.streams.jar;%WAS_HOME%\lib\j2ee.jar;%WAS_HOME%\plugins\com.ibm.ffdc.jar;%cpath%" com.ibm.wps.xmlaccess.XmlAccess %*
+"%JAVA_HOME%\bin\java" -classpath "%cpath%" com.ibm.wps.xmlaccess.XmlAccess %*