diff --git a/SMILA.launch/SMILA-linux.launch b/SMILA.launch/SMILA-linux.launch
index 00b8b5d..317cea6 100644
--- a/SMILA.launch/SMILA-linux.launch
+++ b/SMILA.launch/SMILA-linux.launch
@@ -23,24 +23,24 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:SMILA.application}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.eclipse.equinox.preferences@default:default,org.eclipse.core.jobs@default:default,org.apache.commons.collections@default:default,org.eclipse.persistence.antlr@default:default,org.apache.oro@default:default,org.apache.xml.serializer@default:default,javax.xml@default:default,javax.activation@default:default,org.apache.xml.resolver@default:default,org.apache.commons.httpclient@default:default,org.eclipse.core.filesystem@default:default,org.apache.commons.pool@default:default,org.eclipse.persistence.core@default:default,org.eclipse.persistence.asm@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.ds@3:true,org.eclipse.persistence.jpa@3:true,org.eclipse.equinox.util@2:default,org.eclipse.osgi.services@default:default,javax.servlet@default:default,org.junit@default:default,javax.transaction@default:default,org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default,org.apache.commons.fileupload@default:default,javax.persistence@3:true,org.eclipse.equinox.app@default:default,org.eclipse.core.contenttype@default:default,org.apache.commons.codec@default:default,org.apache.xalan@default:default,org.apache.xerces@default:default,com.ibm.icu@default:default,org.eclipse.osgi@:,org.eclipse.core.runtime@1:default,org.jdom@default:default,javax.resource@default:default,org.eclipse.equinox.common@default:default,org.apache.commons.beanutils@default:default"/>
+<stringAttribute key="target_bundles" value="javax.servlet*2.5.0.v200806031605@default:default,org.eclipse.core.jobs@default:default,com.ibm.icu@default:default,org.apache.commons.collections@default:default,org.eclipse.persistence.jpa@3:true,org.apache.xerces@default:default,org.eclipse.equinox.registry@default:default,org.apache.oro@default:default,javax.activation@default:default,org.eclipse.equinox.ds@3:true,org.apache.commons.httpclient@default:default,org.apache.commons.beanutils@default:default,org.junit@default:default,org.eclipse.core.contenttype@default:default,javax.transaction@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.runtime@1:default,org.eclipse.equinox.util@2:default,org.eclipse.equinox.app@default:default,org.apache.xml.serializer@default:default,org.apache.xml.resolver@default:default,javax.servlet*2.4.0.v200806031604@default:default,org.eclipse.osgi@:,org.eclipse.equinox.preferences@default:default,org.eclipse.persistence.asm@default:default,javax.xml@default:default,org.eclipse.persistence.antlr@default:default,javax.persistence@3:true,org.apache.xalan@default:default,org.apache.commons.pool@default:default,org.apache.commons.fileupload@default:default,org.eclipse.persistence.core@default:default,org.apache.geronimo.specs.geronimo-jms_1.1_spec@default:default,javax.resource@default:default,org.jdom@default:default,org.apache.commons.codec@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.common@default:default"/>
 <booleanAttribute key="tracing" value="false"/>
 <mapAttribute key="tracingOptions">
 <mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
 <mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
+<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/contextlaunching" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
+<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/snapshot" value="1000"/>
 <mapEntry key="org.eclipse.equinox.ds/print_on_console" value="true"/>
 <mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
@@ -49,50 +49,50 @@
 <mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/updateSequence" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
+<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
+<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
 <mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
 <mapEntry key="org.eclipse.team.core/streams" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug/events" value="false"/>
 <mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
+<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
 <mapEntry key="org.eclipse.equinox.ds/debug" value="true"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
+<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
+<mapEntry key="org.eclipse.pde.core/validation" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore" value="false"/>
+<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
 <mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
 <mapEntry key="org.eclipse.equinox.ds/performance" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
 <mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
 <mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
+<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
 <mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
@@ -100,46 +100,46 @@
 <mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
 <mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
+<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
 <mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
+<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
 <mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
 <mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
 <mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
+<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
 <mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
+<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
 <mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.internal.profile.DefaultProfileLogger"/>
+<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
 <mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
 <mapEntry key="org.eclipse.jdt.core/debug/cpresolution/advanced" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/contentProvider" value="false"/>
+<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
 <mapEntry key="org.eclipse.team.core/threading" value="false"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
 <mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
@@ -155,38 +155,38 @@
 <mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
 <mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
 <mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
 <mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
+<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
 <mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
 <mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
 <mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
+<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
 <mapEntry key="org.eclipse.pde.core/cache" value="false"/>
+<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
+<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
 <mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
 <mapEntry key="org.eclipse.team.core/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
+<mapEntry key="org.eclipse.core.runtime/perf/success" value="false"/>
 <mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
@@ -199,8 +199,8 @@
 <mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
+<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
 <mapEntry key="org.eclipse.debug.core/debug/commands" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
@@ -212,19 +212,19 @@
 <mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
+<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
 <mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
+<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
 <mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
 <mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/multipageeditor" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
 <mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
+<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
+<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
 <mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
 <mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
 <mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
@@ -232,12 +232,12 @@
 <mapEntry key="org.eclipse.core.resources/history" value="false"/>
 <mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
 <mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
+<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
 <mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
+<mapEntry key="org.eclipse.debug.core/debug" value="false"/>
 <mapEntry key="org.eclipse.help/debug" value="true"/>
+<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
 <mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
 <mapEntry key="org.eclipse.ui/debug" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
@@ -246,32 +246,32 @@
 <mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
 <mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
+<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
 <mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
 <mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
 <mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
+<mapEntry key="org.eclipse.debug.ui/debug/launchhistory" value="false"/>
 <mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
+<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
 <mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
+<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
 <mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
+<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
 <mapEntry key="org.eclipse.pde.core/debug" value="true"/>
 <mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
 <mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
+<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
 <mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
 <mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
 <mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
+<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
 <mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 </mapAttribute>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.smila.connectivity.framework.crawler.filesystem@4:true,org.apache.log4j@default:default,javax.xml.bind@default:default,org.eclipse.smila.management@3:true,org.eclipse.smila.processing.pipelets@4:true,org.cyberneko.html@default:default,org.eclipse.smila.search.highlighting@4:true,org.apache.commons.logging@default:default,com.sun.jaxb@default:default,org.eclipse.smila.jms@3:default,org.eclipse.smila.search.tools@default:default,org.eclipse.smila.connectivity.deltaindexing@default:default,org.eclipse.smila.processing.pipelets.xmlprocessing@default:default,org.eclipse.smila.connectivity.queue@default:default,org.apache.derby@default:default,javax.xml.stream@default:default,org.apache.activemq.core@default:default,org.apache.tomcat@default:default,org.eclipse.smila.datamodel@default:default,org.eclipse.smila.binarystorage.impl@4:true,org.eclipse.smila.connectivity.framework.crawler.web@4:true,org.eclipse.smila.search.api@default:true,org.apache.lucene.search.highlight@default:default,org.eclipse.smila.processing.bpel@4:true,org.eclipse.smila.tools.cache@default:default,org.eclipse.smila.search.search@default:default,org.eclipse.smila.search.tools.indexstructure@default:default,org.eclipse.smila.processing.pipelets.mimetype@4:true,org.eclipse.smila.connectivity.framework.indexorder@default:default,org.w3c.tidy@default:default,org.eclipse.smila.processing@4:true,org.eclipse.smila.search@4:true,org.eclipse.smila.search.datadictionary@default:default,org.eclipse.smila.datamodel.tools@default:default,org.eclipse.smila.connectivity@default:default,org.apache.ode@3:true,org.eclipse.smila.blackboard@4:true,org.eclipse.smila.utils@default:default,org.eclipse.smila.tomcat@4:true,org.eclipse.smila.tools@default:default,org.eclipse.smila.binarystorage.persistence@default:default,org.eclipse.smila.connectivity.deltaindexing.impl@4:true,javax.servlet.jsp@default:default,org.eclipse.smila.recordstorage@default:default,org.eclipse.smila.management.jmx@4:true,org.apache.commons.lang@default:default,org.eclipse.smila.connectivity.queue.broker.main@4:true,org.eclipse.smila.lucene@4:true,org.eclipse.smila.connectivity.queue.worker@4:true,org.eclipse.smila.search.servlet@default:default,org.eclipse.smila.connectivity.impl@4:true,org.apache.lucene@default:default,javax.el@default:default,org.eclipse.smila.binarystorage@default:default,org.eclipse.smila.binarystorage.persistence.impl@4:true,org.eclipse.smila.recordstorage.impl@4:true,org.eclipse.smila.jms.activemq@3:default,org.apache.commons.io@default:default,org.eclipse.smila.connectivity.framework@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.eclipse.smila.connectivity@default:default,org.eclipse.smila.search.search@default:default,org.eclipse.smila.management@3:true,org.apache.tomcat@default:default,org.eclipse.smila.connectivity.framework.schema@default:default,org.apache.lucene.search.highlight@default:default,org.apache.commons.lang@default:default,javax.xml.stream@default:default,org.eclipse.smila.binarystorage.persistence@default:default,org.eclipse.smila.tomcat@4:true,org.apache.commons.logging@default:default,org.eclipse.smila.management.jmx@4:true,org.eclipse.smila.connectivity.framework@default:default,org.eclipse.smila.connectivity.deltaindexing.impl@4:true,org.apache.activemq.core@default:default,org.eclipse.smila.jms.activemq@3:default,org.w3c.tidy@default:default,org.cyberneko.html@default:default,org.eclipse.smila.connectivity.queue@default:default,com.sun.jaxb@default:default,org.eclipse.smila.recordstorage@default:default,org.eclipse.smila.search@4:true,org.eclipse.smila.search.tools.indexstructure@default:default,org.eclipse.smila.connectivity.impl@4:true,org.eclipse.smila.connectivity.framework.crawler.filesystem@4:true,org.eclipse.smila.connectivity.deltaindexing@default:default,org.eclipse.smila.connectivity.framework.impl@4:true,javax.servlet.jsp@default:default,org.eclipse.smila.search.highlighting@4:true,org.eclipse.smila.processing.pipelets@4:true,javax.xml.bind@default:default,org.eclipse.smila.search.servlet@default:default,org.eclipse.smila.tools@default:default,org.eclipse.smila.binarystorage.impl@4:true,org.eclipse.smila.recordstorage.impl@4:true,org.eclipse.smila.datamodel@default:default,org.eclipse.smila.binarystorage.persistence.impl@4:true,org.eclipse.smila.search.datadictionary@default:default,org.eclipse.smila.search.api@default:true,org.eclipse.smila.connectivity.framework.crawler.web@4:true,org.eclipse.smila.processing.pipelets.xmlprocessing@default:default,org.apache.ode@3:true,org.eclipse.smila.connectivity.queue.broker.main@4:true,javax.el@default:default,org.eclipse.smila.processing.pipelets.mimetype@4:true,org.eclipse.smila.processing@4:true,org.eclipse.smila.utils@default:default,org.apache.derby@default:default,org.apache.lucene@default:default,org.eclipse.smila.processing.bpel@4:true,org.eclipse.smila.blackboard@4:true,org.eclipse.smila.datamodel.tools@default:default,org.apache.commons.io@default:default,org.eclipse.smila.tools.cache@default:default,org.apache.log4j@default:default,org.eclipse.smila.jms@3:default,org.eclipse.smila.binarystorage@default:default,org.eclipse.smila.connectivity.queue.worker@4:true,org.eclipse.smila.lucene@4:true,org.eclipse.smila.search.tools@default:default"/>
 </launchConfiguration>
diff --git a/SMILA.launch/SMILA.launch b/SMILA.launch/SMILA.launch
index 18fdab7..cd62962 100644
--- a/SMILA.launch/SMILA.launch
+++ b/SMILA.launch/SMILA.launch
@@ -273,5 +273,5 @@
 <mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
 </mapAttribute>
 <booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.eclipse.smila.connectivity.framework.crawler.filesystem@4:true,org.apache.log4j@default:default,org.eclipse.smila.connectivity.framework.impl@4:true,javax.xml.bind@default:default,org.eclipse.smila.management@3:true,org.eclipse.smila.processing.pipelets@4:true,org.cyberneko.html@default:default,org.eclipse.smila.search.highlighting@4:true,org.apache.commons.logging@default:default,com.sun.jaxb@default:default,org.eclipse.smila.jms@3:default,org.eclipse.smila.search.tools@default:default,org.eclipse.smila.connectivity.deltaindexing@default:default,org.eclipse.smila.processing.pipelets.xmlprocessing@default:default,org.eclipse.smila.connectivity.queue@default:default,org.apache.derby@default:default,javax.xml.stream@default:default,org.apache.activemq.core@default:default,org.apache.tomcat@default:default,org.eclipse.smila.datamodel@default:default,org.eclipse.smila.binarystorage.impl@4:true,org.eclipse.smila.connectivity.framework.crawler.web@default:true,org.eclipse.smila.search.api@default:true,org.apache.lucene.search.highlight@default:default,org.eclipse.smila.processing.bpel@4:true,org.eclipse.smila.tools.cache@default:default,org.eclipse.smila.search.search@default:default,org.eclipse.smila.search.tools.indexstructure@default:default,org.eclipse.smila.processing.pipelets.mimetype@4:true,org.eclipse.smila.connectivity.framework.indexorder@default:default,org.w3c.tidy@default:default,org.eclipse.smila.processing@4:true,org.eclipse.smila.search@4:true,org.eclipse.smila.search.datadictionary@default:default,org.eclipse.smila.datamodel.tools@default:default,org.eclipse.smila.connectivity@default:default,org.apache.ode@3:true,org.eclipse.smila.blackboard@4:true,org.eclipse.smila.utils@default:default,org.eclipse.smila.tomcat@4:true,org.eclipse.smila.tools@default:default,org.eclipse.smila.binarystorage.persistence@default:default,org.eclipse.smila.connectivity.deltaindexing.impl@4:true,javax.servlet.jsp@default:default,org.eclipse.smila.recordstorage@default:default,org.eclipse.smila.management.jmx@4:true,org.apache.commons.lang@default:default,org.eclipse.smila.connectivity.queue.broker.main@4:true,org.eclipse.smila.lucene@4:true,org.eclipse.smila.connectivity.queue.worker@4:true,org.eclipse.smila.search.servlet@default:true,org.eclipse.smila.connectivity.impl@4:true,org.apache.lucene@default:default,javax.el@default:default,org.eclipse.smila.binarystorage@default:default,org.eclipse.smila.binarystorage.persistence.impl@4:true,org.eclipse.smila.recordstorage.impl@4:true,org.eclipse.smila.jms.activemq@3:default,org.apache.commons.io@default:default,org.eclipse.smila.connectivity.framework@default:default"/>
+<stringAttribute key="workspace_bundles" value="org.eclipse.smila.connectivity.framework.crawler.filesystem@4:true,org.apache.log4j@default:default,org.eclipse.smila.connectivity.framework.impl@4:true,javax.xml.bind@default:default,org.eclipse.smila.management@3:true,org.eclipse.smila.processing.pipelets@4:true,org.cyberneko.html@default:default,org.eclipse.smila.search.highlighting@4:true,org.apache.commons.logging@default:default,com.sun.jaxb@default:default,org.eclipse.smila.jms@3:default,org.eclipse.smila.search.tools@default:default,org.eclipse.smila.connectivity.deltaindexing@default:default,org.eclipse.smila.processing.pipelets.xmlprocessing@default:default,org.eclipse.smila.connectivity.queue@default:default,org.apache.derby@default:default,javax.xml.stream@default:default,org.apache.activemq.core@default:default,org.apache.tomcat@default:default,org.eclipse.smila.datamodel@default:default,org.eclipse.smila.binarystorage.impl@4:true,org.eclipse.smila.connectivity.framework.crawler.web@default:true,org.eclipse.smila.search.api@default:true,org.apache.lucene.search.highlight@default:default,org.eclipse.smila.processing.bpel@4:true,org.eclipse.smila.tools.cache@default:default,org.eclipse.smila.search.search@default:default,org.eclipse.smila.search.tools.indexstructure@default:default,org.eclipse.smila.processing.pipelets.mimetype@4:true,org.eclipse.smila.connectivity.framework.schema@default:default,org.w3c.tidy@default:default,org.eclipse.smila.processing@4:true,org.eclipse.smila.search@4:true,org.eclipse.smila.search.datadictionary@default:default,org.eclipse.smila.datamodel.tools@default:default,org.eclipse.smila.connectivity@default:default,org.apache.ode@3:true,org.eclipse.smila.blackboard@4:true,org.eclipse.smila.utils@default:default,org.eclipse.smila.tomcat@4:true,org.eclipse.smila.tools@default:default,org.eclipse.smila.binarystorage.persistence@default:default,org.eclipse.smila.connectivity.deltaindexing.impl@4:true,javax.servlet.jsp@default:default,org.eclipse.smila.recordstorage@default:default,org.eclipse.smila.management.jmx@4:true,org.apache.commons.lang@default:default,org.eclipse.smila.connectivity.queue.broker.main@4:true,org.eclipse.smila.lucene@4:true,org.eclipse.smila.connectivity.queue.worker@4:true,org.eclipse.smila.search.servlet@default:true,org.eclipse.smila.connectivity.impl@4:true,org.apache.lucene@default:default,javax.el@default:default,org.eclipse.smila.binarystorage@default:default,org.eclipse.smila.binarystorage.persistence.impl@4:true,org.eclipse.smila.recordstorage.impl@4:true,org.eclipse.smila.jms.activemq@3:default,org.apache.commons.io@default:default,org.eclipse.smila.connectivity.framework@default:default"/>
 </launchConfiguration>