diff --git a/.travis.yml b/.travis.yml
index 41462d6a5a..49b67b4d5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,7 @@ jobs:
         - sleep 10
         - sudo systemctl status docker.service
         # Pull Docker images required for integration tests
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - docker pull kartoza/postgis
         - ./build.sh integrationStage
         # Killing background sleep loop
@@ -84,6 +85,7 @@ jobs:
       script:
         # Output something every minute lest Travis kills the job
         - while sleep 1m; do echo "=====[ still running after $SECONDS seconds... ]====="; done &
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         - mkdir -p build/target
         - ./build.sh product -a ${ARCH} -o ${PLATFORM} ${ADDITIONAL_FLAGS} ${PRODUCT}
         # Killing background sleep loop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5bbb853aa..0a3d8d3336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,43 @@
 All notable changes to this project will be documented in this file.
 See the [change log guidelines](http://keepachangelog.com/) for information on how to structure the file.
 
+## [Unreleased]
+
+## [4.1.0]
+
+### Added
+
+- Support for selecting multiple files during schema and the data import
+- END-related schemas added in presets
+- Support to remove a single schema from the project view
+- Support to export the source and the transformed data to Shapefiles using GeoTools
+- Support for missing time zone information when parsing timestamps
+- Support for creating a spatial index when writing GeoPackage files
+- Support for Java 8 date/time classes in Groovy
+
+### Changed
+
+- Activated XML pretty printing by default in the writer settings dialog page when exporting XML/GML
+
+### Removed
+
+- xtraserver plugin
+
+### Fixed
+
+- Fix application not starting on macOS
+- Fix duplicate imports of the same schema when the schema locations differ only in the scheme part
+- Fix use of IProxyService to apply proxy configuration in the UI
+- Fix validity check of the hale»connect export dialog
+- Fix loading of projects in case user context is not supported
+- Fix ArcString interpolation handling
+- Fix handling of HTTPS schema locations in schema resolver
+- Fix for failing PostGIS integration tests
+- Fix the last modified check when loading Groovy snippet from file
+- Fix failing of CRS without remarks for geopackage
+- Fix use of correct preferred bundle when loading geometry types
+- Fix to not append time zone information when writing xmlDate
+
 ## [4.0.0]
 
 ### Added
@@ -360,6 +397,8 @@ See the [change log guidelines](http://keepachangelog.com/) for information on h
 
 Changes so far have been documented in the [hale help](http://hale.igd.fraunhofer.de/2.9.4/help/topic/eu.esdihumboldt.hale.doc.user/html/new/2_9_0.xhtml?cp=2_1_0).
 
+[Unreleased]: https://github.com/halestudio/hale/compare/4.1.0...HEAD
+[4.1.0]: https://github.com/halestudio/hale/compare/4.0.0...4.1.0
 [4.0.0]: https://github.com/halestudio/hale/compare/3.5.0...4.0.0
 [3.5.0]: https://github.com/halestudio/hale/compare/3.4.1...3.5.0
 [3.4.1]: https://github.com/halestudio/hale/compare/3.4.0...3.4.1
diff --git a/README.md b/README.md
index 6e3689e45b..33d1263cac 100644
--- a/README.md
+++ b/README.md
@@ -48,6 +48,7 @@ To contribute please check the [contribution guidelines](CONTRIBUTING.md) and re
 * [hale Community Forum](http://discuss.wetransform.to)
 * [hale Community Blog](https://www.wetransform.to/category/news/)
 * [hale Video Tutorial (4 Minutes)](https://www.youtube.com/watch?v=95Krki4thgs)
+* [hale in-depth Video Tutorial (37 minutes)](https://www.youtube.com/watch?v=BKNMV-Jp9HM)
 
 ## License
 
diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF
index cfc3249099..aeb64ea8f6 100644
--- a/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF
+++ b/app/plugins/eu.esdihumboldt.hale.app.cli.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale CLI Default Commands
 Bundle-SymbolicName: eu.esdihumboldt.hale.app.cli.commands;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.util.cli;bundle-version="2.9.5",
diff --git a/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF
index d1111d306c..954ebd3506 100644
--- a/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF
+++ b/app/plugins/eu.esdihumboldt.hale.app.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale CLI application
 Bundle-SymbolicName: eu.esdihumboldt.hale.app.cli;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.hale.common.core,
diff --git a/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF
index 6a43391bda..2cfac466c5 100644
--- a/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF
+++ b/app/plugins/eu.esdihumboldt.hale.app.transform.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Transformation Application Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.app.transform.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.app.transform;bundle-version="2.9.0",
diff --git a/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF b/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF
index 3d353f3c55..42ce6da686 100644
--- a/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF
+++ b/app/plugins/eu.esdihumboldt.hale.app.transform/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application for command line transformation
 Bundle-SymbolicName: eu.esdihumboldt.hale.app.transform;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/build/build.gradle b/build/build.gradle
index e17b8d740e..813313dbfa 100644
--- a/build/build.gradle
+++ b/build/build.gradle
@@ -147,7 +147,7 @@ ext {
 		'eu.esdihumboldt.hale.ui.feature.linux': ['linux'],
 		'eu.esdihumboldt.hale.ui.feature.macosx': ['macosx']
 	]
-	
+
 	/*
 	 * List of bundles that are not platform specific, even if they are detected as such.
 	 */
@@ -156,9 +156,8 @@ ext {
 	]
 
 	// URL to the directory containing mirrored artifacts (Maven, JRE, ...)
-	//artifactsCommit = '6589f561a36b8a6fe4cd6a115fdc892bbf812c68'
-	//artifactsMirrorUrl = "https://gitlab.wetransform.to/hale/hale-build-support/raw/${artifactsCommit}"
-	artifactsMirrorUrl = "http://build-artifacts.wetransform.to/hale-build-support-96b81f6"
+	artifactsCommit = '6431f1d635126138b32611dcc47467a401448c8e'
+	artifactsMirrorUrl = "https://gitlab.wetransform.to/hale/hale-build-support/raw/${artifactsCommit}"
 
     // Names of zip files containing Java Runtimes (sorted by their respective platform)
     jreArtifacts = [
@@ -172,12 +171,14 @@ ext {
             'gtk': [
                 'x86_64': 'OpenJDK8U-jre_x64_linux_hotspot_8u232b09.tar.gz'
             ]
-        ]/*, -- not available right now
+        ], //Make sure when `tar.gz` is extracted then the hirarchy should be `<jdk-name>/Contents/...`.
+		   //For e.g. `jdk8u282-b08/Contents/...` becuase during extraction, root folder named `jdk8u282-b08`
+		   //is being stripped and the `Contents` folder is being copied into jre folder.
         'macosx': [
             'cocoa': [
-                'x86_64': 'jdk-min-8u91-macosx-x64.tar.gz'
+                'x86_64': 'OpenJDK8U-jdk_x64_mac_openj9_macosXL_8u282b08_openj9-0.24.0.tar.gz'
             ]
-        ]*/
+        ]
     ]
 
     // Names of zip files containing mongodb instances (sorted by their respective platform)
@@ -239,7 +240,7 @@ configureEnvironment()
 
 def configureEnvironment() {
 	def wsMap = [win32: 'win32', linux: 'gtk', macosx: 'cocoa']
-	
+
 	def current_os = System.getProperty('os.name')
 	if (current_os.substring(0, 5).equalsIgnoreCase('linux'))
 	  current_os = 'linux'
@@ -253,7 +254,7 @@ def configureEnvironment() {
 	  current_arch = 'x86'
 	else if(current_arch == 'amd64')
 	  current_arch = 'x86_64'
-	
+
     if (!ext.properties.containsKey('osgiOS')) {
         ext.osgiOS = current_os
     }
diff --git a/build/config.groovy b/build/config.groovy
index 9ab983c70e..d920a8d9c2 100644
--- a/build/config.groovy
+++ b/build/config.groovy
@@ -5,7 +5,7 @@
 project = {
 	// version
 	// major.minor.micro-SNAPSHOT - remove -SNAPSHOT for releases
-	version = '4.0.0'
+	version = '4.1.0-SNAPSHOT'
 
 	// when increasing the version number, at least the version of the .application bundles
 	// should be increased so they state an updated application version
diff --git a/build/gradle/commitAndProductionStage.gradle b/build/gradle/commitAndProductionStage.gradle
index 95c6b42da3..bb39d664f8 100644
--- a/build/gradle/commitAndProductionStage.gradle
+++ b/build/gradle/commitAndProductionStage.gradle
@@ -24,6 +24,7 @@ import java.nio.file.Files;
 import java.text.SimpleDateFormat
 import org.apache.maven.cli.MavenCli
 import org.yaml.snakeyaml.Yaml
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * @return the value of the 'productFile' property
@@ -390,9 +391,15 @@ def includeAdditionalFiles(artifacts, relsrcpath, productOutputPath, reldstpath,
 		    if (!Helper.buildForMac(project)) {
 		        ant.untar(src: artifactZipPath, dest: artifactInstallPath, compression: 'gzip')
 		    } else {
-				// Use external tar command for OSX build since the jdk to bundle with HALE contains symbolic links
+				//It is certain that this code will run when creating build for mac.
+				//Therefore, the jre must be copied into the `Eclipse` folder of the bundled application.
+				artifactInstallPath = new File(productOutputPath.absolutePath ,"/Eclipse.app/Contents/Eclipse/${reldstpath}")
+				
+				// Use external tar command for OSX build since the jdk to bundle with HALE, contains symbolic links.
 				// This does only work on UNIX-based systems with tar installed!
-				def command = ['tar', '--preserve-permissions','-xzf', artifactZipPath.absolutePath]
+				//This command during extraction, will strip the root folder from jdk which is usually jdk name and will
+				//extract the data into root folder starting with `Contents`. 
+				def command = ['tar', '--preserve-permissions','-xzf', artifactZipPath.absolutePath, '--strip-components=1']
 			    artifactInstallPath.mkdir()
 			 	try {
 				    // On windows, an IOException will be thrown here
@@ -407,6 +414,10 @@ def includeAdditionalFiles(artifacts, relsrcpath, productOutputPath, reldstpath,
 				} catch (ex) {
 				    throw new IllegalStateException("Unable to unpack ${name} - The MacOSX build requires a UNIX-based system with tar installed:\n${ex.toString()}")
 				}
+				if (reldstpath.equals("jre")){
+					//update HALE.ini file with the JRE path bundled in the Eclipse.app.
+					updateHaleIniFileWithJrePath(productOutputPath.absolutePath + "/Eclipse.app/Contents/Eclipse/HALE.ini")
+				}
 			}
         }
     } else {
@@ -629,6 +640,11 @@ def packageClient(productOutputPath) {
 		targetDir.mkdir()
 		def tarPath = targetDir.absolutePath + '/' + packageName + '.tar.gz';
 		def packCmd =  ['tar', '--preserve-permissions', '-czf', tarPath, '--transform', "s,^\\./,$packageName/,", '.']
+		//If the build script is run on the OS X then use gtar command.
+		//Note: gtar must be installed using `brew install gnu-tar`.
+		if (Os.isFamily(Os.FAMILY_MAC)) {
+			packCmd =  ['gtar', '--preserve-permissions', '-czf', tarPath, '--transform', "s,^\\./,$packageName/,", '.']
+		}
 		def packProc = packCmd.execute(null, productOutputPath)
 		def packBuffer = new StringBuffer()
 		packProc.consumeProcessErrorStream(packBuffer)
@@ -664,6 +680,10 @@ def packageClient(productOutputPath) {
 
 		// Generate DMG image
 		def genisoCmd = ['genisoimage', '-V', "${productName} ${bundleVersion}", '-D', '-R', '-apple', '-no-pad', '-o', "${targetDir}/${packageName}.dmg", '.']
+		//create dmg file if the script is run on mac OS.
+		if (Os.isFamily(Os.FAMILY_MAC)) {
+			genisoCmd = "hdiutil create -ov -format UDZO -srcfolder ${productOutputPath.absolutePath} ${targetDir}/${packageName}.dmg"
+		}
 		def genisoProc = genisoCmd.execute(null, productOutputPath)
 		def genisoBuffer = new StringBuffer()
 		genisoProc.consumeProcessErrorStream(genisoBuffer)
@@ -826,6 +846,32 @@ def packageServer(productOutputPath) {
     }
 }
 
+/**
+ * Method executed only for OS X. 
+ * To run the HALE studio in mac, JRE must be bundled within the HALE studio app
+ * and its location must be added in the HALE.ini file.
+ * This method is a work around to modify HALE.ini file.
+ * This method reads HALE.ini file stored under "~/Eclipse.app/Contents/Eclipse/HALE.ini",
+ * then appends "-vm" arguments along with the JRE location bundled within the application.
+ * Finally, the changes are written back to the "HALE.ini" file.
+ * filepath HALE.ini file path
+ */
+def updateHaleIniFileWithJrePath(filepath) {
+
+	File file = new File(filepath)
+	def fileContent = file.getText();
+
+	def indexOfVmargs = fileContent.indexOf("-vmargs")
+	
+	def updatedContent = fileContent.substring(0, indexOfVmargs)
+	.concat("-vm\n")
+	.concat("../Eclipse/jre/Contents/Home/jre/bin/java\n")
+	.concat(fileContent.substring(indexOfVmargs, fileContent.length()))
+
+	println("HALE.ini file contents changed successfully!!")
+	file.write(updatedContent)
+}
+
 task makeProductFeatureProjectDefinition(type: Copy) {
     from Helper.resolveTemplate(project, 'plugin-project.xml')
     into new File(buildDir, 'gen.product.feature')
@@ -945,7 +991,9 @@ task createProductFeature(dependsOn: [ generatePomFiles, makeProductFile, makePr
 	new File("$productFeaturePath/HALE.p2.inf").text = '''
 instructions.configure=\
   addRepository(location:http${#58}//hale-geoserver.geo-solutions.it/,type:0,name:GeoServer App-Schema Plug-in for hale studio,enabled:true);\
-  addRepository(location:http${#58}//hale-geoserver.geo-solutions.it/,type:1,name:GeoServer App-Schema Plug-in for hale studio,enabled:true);
+  addRepository(location:http${#58}//hale-geoserver.geo-solutions.it/,type:1,name:GeoServer App-Schema Plug-in for hale studio,enabled:true);\
+  addRepository(location:https${#58}//interactive-instruments.github.io/xtraserver-plugin-for-hale/,type:0,name:XtraServer Plug-in for hale studio,enabled:true);\
+  addRepository(location:https${#58}//interactive-instruments.github.io/xtraserver-plugin-for-hale/,type:1,name:XtraServer Plug-in for hale studio,enabled:true);
 '''
 
     // remove platform-specific fragments from product
diff --git a/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml b/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml
index f9ffbfcdbb..d47fe3b409 100644
--- a/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml
+++ b/common/features/eu.esdihumboldt.hale.common.feature.base/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.common.feature.base"
       label="Equinox base feature"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
diff --git a/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml b/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml
index 20db22c24b..8c7a141d21 100644
--- a/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml
+++ b/common/features/eu.esdihumboldt.hale.common.feature.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.common.feature.core"
       label="HALE core logic and models"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/common/features/eu.esdihumboldt.hale.common.feature.orient/feature.xml b/common/features/eu.esdihumboldt.hale.common.feature.orient/feature.xml
index 0d20cec3fa..e8cdb781d4 100644
--- a/common/features/eu.esdihumboldt.hale.common.feature.orient/feature.xml
+++ b/common/features/eu.esdihumboldt.hale.common.feature.orient/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.common.feature.orient"
       label="OrientDB based Instance Database"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel">
 
    <license>
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.groovy.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.groovy.test/META-INF/MANIFEST.MF
index 71328ef4da..40fabc179a 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.groovy.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment Groovy API and Utilities Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align.groovy;bundle-version="2.6.0",
  eu.esdihumboldt.hale.common.schema.groovy;bundle-version="2.6.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.groovy/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.groovy/META-INF/MANIFEST.MF
index bd1d399b06..fde6f27006 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.groovy/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment Groovy API and Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="11.0.1",
  eu.esdihumboldt.hale.common.align.io.impl.internal.generated;version="2.9.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF
index 57778a40c4..6ab76952fc 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.merge.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment Merge Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.merge.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.3.7",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.merge/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.merge/META-INF/MANIFEST.MF
index 9ea5631249..0693525013 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.merge/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.merge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment Merger
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.merge;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="3.3.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF
index 1997043b6b..9c43961e5f 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Alignment API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.test;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="11.0.1",
  eu.esdihumboldt.hale.common.align.io.impl.internal.generated;version="2.9.5",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.tgraph.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.tgraph.test/META-INF/MANIFEST.MF
index e4b3ea1a6d..8f47b25851 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.tgraph.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.tgraph.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Transformation Graph Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.tgraph.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="11.0.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.tgraph/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align.tgraph/META-INF/MANIFEST.MF
index adb6974711..e7423a765d 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align.tgraph/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align.tgraph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Transformation Graph
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align.tgraph
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="11.0.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF
index cfedaebdc3..5281a47d93 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.align/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Alignment API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.align;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="1.6.0",
  com.google.common.collect;version="1.6.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png
new file mode 100644
index 0000000000..547f25277e
Binary files /dev/null and b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png differ
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png
new file mode 100644
index 0000000000..0d334ecfba
Binary files /dev/null and b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png differ
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/help.xhtml b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/help.xhtml
new file mode 100644
index 0000000000..57a6518404
--- /dev/null
+++ b/common/plugins/eu.esdihumboldt.hale.common.align/help/formattedString/help.xhtml
@@ -0,0 +1,20 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Formatted String</title>
+</head>
+<body>
+<div id ="help">
+	<h4>Example mapping:</h4>
+	<p>
+		The formatted string function enables users to access attribute values and project variables to create concatenated string values. Enter text in the text field and double click on any available attribute value displayed in the function dialog to add the value. Alternatively press <code>Ctrl+Space</code> to access available variables and project variables. The entered values are concatenated to create string values in the target attribute.<br>
+	</br>
+		<img src="../../eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string.png" /><br>
+	</br>
+	<img src="../../eu.esdihumboldt.hale.common.align/help/formattedString/Formatted_string_mapping.png" /><br>
+</br>
+	</p>
+</div>
+</body>
+</html>
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml b/common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml
index 035ab5d471..1022904c4a 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml
+++ b/common/plugins/eu.esdihumboldt.hale.common.align/plugin.xml
@@ -241,6 +241,7 @@
             cellMigrator="eu.esdihumboldt.hale.common.align.model.functions.FormattedStringMigrator"
             description="Creates a formatted string based on a pattern and the input variables"
             icon="icons/text.png"
+            help="help/formattedString/help.xhtml"
             identifier="eu.esdihumboldt.hale.align.formattedstring"
             name="Formatted string">
          <sourceProperties>
diff --git a/common/plugins/eu.esdihumboldt.hale.common.app/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.app/META-INF/MANIFEST.MF
index 34de14eb49..ee64eebe07 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.app/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.app/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Application Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.app
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.common.app.internal.Activator
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF
index 314a41d428..aef7ae2149 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.cache.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Cache Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.cache.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.common.cache;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.junit
diff --git a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF
index 32d8171e38..0b007d4d64 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.cache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Cache
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.cache;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.io;version="9.0.0",
  de.fhg.igd.osgi.util,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.cli/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.cli/META-INF/MANIFEST.MF
index 84eb8fd259..aec5f28a0c 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.cli/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale Core CLI Commands
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.cli;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.3.7",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.codelist.validator/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.codelist.validator/META-INF/MANIFEST.MF
index 2b2baed226..e9351dc3f3 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.codelist.validator/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.codelist.validator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Codelist validator for instances
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.codelist.validator;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.slf4jplus,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.codelist/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.codelist/META-INF/MANIFEST.MF
index a50a070b87..d8515df5a9 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.codelist/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.codelist/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE CodeList Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.codelist;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="15.0.0",
  eu.esdihumboldt.hale.common.align.model,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.config.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.config.test/META-INF/MANIFEST.MF
index 9386261cda..40b0a9603a 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.config.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.config.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Configuration utilities for hale tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.config.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.common.config;bundle-version="3.5.0"
 Automatic-Module-Name: eu.esdihumboldt.hale.common.config.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.config/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.config/META-INF/MANIFEST.MF
index e4c778c30b..d91661874f 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.config/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.config/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Configuration utilities for hale
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.config
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Automatic-Module-Name: eu.esdihumboldt.hale.common.config
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.4.14",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.convert.core/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.convert.core/META-INF/MANIFEST.MF
index 2fee7b8147..022ee232a3 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.convert.core/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.convert.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core Converters
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.convert.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.convert;bundle-version="2.5.0",
  groovy;bundle-version="2.3.7"
diff --git a/common/plugins/eu.esdihumboldt.hale.common.convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToInstantConverter.java b/common/plugins/eu.esdihumboldt.hale.common.convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToInstantConverter.java
index d3ee0954ad..8988d2ed06 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToInstantConverter.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToInstantConverter.java
@@ -16,6 +16,7 @@
 package eu.esdihumboldt.hale.common.convert.core;
 
 import java.time.Instant;
+import java.time.format.DateTimeParseException;
 
 import org.springframework.core.convert.converter.Converter;
 
@@ -31,7 +32,19 @@ public Instant convert(String source) {
 		if (source == null) {
 			return null;
 		}
-		return Instant.parse(source);
-	}
 
+		Instant result;
+		try {
+			result = Instant.parse(source);
+		} catch (DateTimeParseException e) {
+			// Be lenient about missing time zone information
+			try {
+				result = Instant.parse(source + "Z");
+			} catch (Throwable t) {
+				throw e;
+			}
+		}
+
+		return result;
+	}
 }
diff --git a/common/plugins/eu.esdihumboldt.hale.common.convert.wkt/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.convert.wkt/META-INF/MANIFEST.MF
index c63a7d49ac..bf579e0289 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.convert.wkt/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.convert.wkt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WKT Geometry Converters
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.convert.wkt;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.locationtech.jts,
  org.locationtech.jts.geom,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.convert/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.convert/META-INF/MANIFEST.MF
index 6889d123e3..6b06fe99e0 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.convert/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.convert/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Conversion Service
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.convert;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.springframework.core;bundle-version="3.0.0";visibility:=reexport,
  org.eclipse.core.runtime;bundle-version="3.10.0"
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF
index 737296080d..963255e978 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.core.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Core API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.core.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.common.core;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: junit.framework;version="4.8.2",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF
index 339e76b93e..f698a4949b 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Core API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.common.core.internal.CoreBundle
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/ImportProvider.java b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/ImportProvider.java
index efe28617b0..b373aec270 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/ImportProvider.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/ImportProvider.java
@@ -16,8 +16,10 @@
 
 package eu.esdihumboldt.hale.common.core.io;
 
+import java.io.IOException;
 import java.io.InputStream;
 
+import eu.esdihumboldt.hale.common.core.io.report.IOReport;
 import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
 
 /**
@@ -63,4 +65,26 @@ public interface ImportProvider extends IOProvider {
 	 */
 	public String getResourceIdentifier();
 
+	/**
+	 * This method executes the I/O provider. It is a special case of
+	 * <code>IOProvider.execute(ProgressIndicator progress)</code> and used when
+	 * importing multiple schemas or instances. The method is overloaded with
+	 * resourceIdentifier because for every file selected by the user a new
+	 * resource identifier has to be generated so that every schema
+	 * in @link{SchemaServiceImpl} gets a new ID for the selected schema.
+	 * 
+	 * @param progress the progress indicator, may be <code>null</code>
+	 * @param resourceIdentifier identifier of the provided resource. Null if a
+	 *            new resource id needs to be generated.
+	 * @return the execution report
+	 * 
+	 * @throws IOProviderConfigurationException if the I/O provider was not
+	 *             configured properly
+	 * @throws IOException if an I/O operation fails
+	 * @throws UnsupportedOperationException if the operation to load multiple
+	 *             files is not supported.
+	 */
+	public IOReport execute(ProgressIndicator progress, String resourceIdentifier)
+			throws IOProviderConfigurationException, IOException, UnsupportedOperationException;
+
 }
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/AbstractImportProvider.java b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/AbstractImportProvider.java
index 1ab9b890fd..1fcffccf3f 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/AbstractImportProvider.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/AbstractImportProvider.java
@@ -74,6 +74,21 @@ public IOReport execute(ProgressIndicator progress)
 		return super.execute(progress);
 	}
 
+	/**
+	 * @see eu.esdihumboldt.hale.common.core.io.impl.AbstractIOProvider#execute(eu.esdihumboldt.hale.common.core.io.ProgressIndicator,
+	 *      java.lang.String)
+	 */
+	@SuppressWarnings("javadoc")
+	@Override
+	public IOReport execute(ProgressIndicator progress, String resourceIdentifier)
+			throws IOProviderConfigurationException, IOException, UnsupportedOperationException {
+
+		if (resourceIdentifier == null) {
+			this.resourceIdentifier = generateResourceId();
+		}
+		return super.execute(progress);
+	}
+
 	/**
 	 * Generate the unique resource identifier.
 	 * 
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/GZipEnabledImport.java b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/GZipEnabledImport.java
index e23952ca1a..1334e7c60f 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/GZipEnabledImport.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/impl/GZipEnabledImport.java
@@ -64,6 +64,12 @@ public URI getUsedLocation() {
 			return getLocation();
 		}
 
+		/**
+		 * @return the wrapped LocatableInputSupplier
+		 */
+		public LocatableInputSupplier<? extends InputStream> getSource() {
+			return source;
+		}
 	}
 
 	/**
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/supplier/FilesIOSupplier.java b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/supplier/FilesIOSupplier.java
new file mode 100644
index 0000000000..7db7976c2c
--- /dev/null
+++ b/common/plugins/eu.esdihumboldt.hale.common.core/src/eu/esdihumboldt/hale/common/core/io/supplier/FilesIOSupplier.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.common.core.io.supplier;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import eu.esdihumboldt.util.io.InputSupplier;
+import eu.esdihumboldt.util.io.OutputSupplier;
+
+/**
+ * I/O supplier based on a {@link File} and used when importing multiple schemas
+ * or instances.
+ * 
+ * @author Kapil Agnihotri
+ */
+public class FilesIOSupplier
+		implements LocatableInputSupplier<InputStream>, LocatableOutputSupplier<OutputStream> {
+
+	private final File file;
+	private final List<File> files;
+	private final List<URI> usedURILocations;
+	private final URI usedURI;
+
+	/**
+	 * Create a file I/O supplier.
+	 * 
+	 * @param file the file
+	 */
+	public FilesIOSupplier(File file) {
+		this(file, file.toURI());
+	}
+
+	/**
+	 * Create a file I/O supplier, which may return a relative URI on
+	 * {@link #getLocation()}.
+	 * 
+	 * @param absoluteFile the file
+	 * 
+	 * @param usedURI the (relative) URI to use
+	 * 
+	 */
+	public FilesIOSupplier(File absoluteFile, URI usedURI) {
+		this(Arrays.asList(absoluteFile), Arrays.asList(usedURI));
+	}
+
+	/**
+	 * Create a file I/O supplier, which may return a relative URI on
+	 * {@link #getLocation()}.
+	 * 
+	 * @param files list of files
+	 * @param uris list of the (relative) URI to use
+	 * 
+	 */
+	public FilesIOSupplier(List<File> files, List<URI> uris) {
+		super();
+		this.file = files.get(0);
+		this.usedURI = uris.get(0);
+		this.files = files;
+		this.usedURILocations = uris;
+	}
+
+	/**
+	 * @see InputSupplier#getInput()
+	 */
+	@Override
+	public InputStream getInput() throws IOException {
+		return new BufferedInputStream(new FileInputStream(file));
+	}
+
+	/**
+	 * @see OutputSupplier#getOutput()
+	 */
+	@Override
+	public OutputStream getOutput() throws IOException {
+		return new BufferedOutputStream(new FileOutputStream(file));
+	}
+
+	/**
+	 * @see Locatable#getLocation()
+	 */
+	@Override
+	public URI getLocation() {
+		return file.toURI();
+	}
+
+	/**
+	 * @see java.lang.Object#hashCode()
+	 */
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((file == null) ? 0 : file.hashCode());
+		return result;
+	}
+
+	/**
+	 * @see java.lang.Object#equals(java.lang.Object)
+	 */
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		FilesIOSupplier other = (FilesIOSupplier) obj;
+		if (file == null) {
+			if (other.file != null)
+				return false;
+		}
+		else if (!file.equals(other.file))
+			return false;
+		return true;
+	}
+
+	@Override
+	public URI getUsedLocation() {
+		return usedURI;
+	}
+
+	/**
+	 * Getter
+	 * 
+	 * @return the list of files
+	 */
+	public List<File> getFiles() {
+		return files;
+	}
+
+	/**
+	 * Method to get a list of all the locations selected by the user during
+	 * multiple import.
+	 * 
+	 * @return list of URIs.
+	 */
+	public List<URI> getUsedLocations() {
+		return usedURILocations;
+	}
+
+	/**
+	 * Get the locations
+	 * 
+	 * @return the list of locations, may be <code>null</code>
+	 */
+	public List<URI> getLocations() {
+		return files.stream().map(f -> f.toURI()).collect(Collectors.toList());
+	}
+
+}
diff --git a/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF
index d81cf8503c..f35c57039d 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.filter.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hale Filter API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.filter.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.locationtech.jts;version="1.13.0",
  org.locationtech.jts.geom;version="1.13.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF
index 32b8b4f7c7..19b5902fd0 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.filter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hale Filter API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.filter;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.slf4jplus,
  eu.esdihumboldt.hale.common.align.groovy.accessor,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.groovy.sandbox.enable/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.groovy.sandbox.enable/META-INF/MANIFEST.MF
index 02af65f6f5..5cde16b6bd 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.groovy.sandbox.enable/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.groovy.sandbox.enable/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Enable Groovy Sandbox Service (for server side operation)
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.groovy.sandbox.enable;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.util.groovy.sandbox
 Require-Bundle: eu.esdihumboldt.hale.common.core
diff --git a/common/plugins/eu.esdihumboldt.hale.common.headless.orient/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.headless.orient/META-INF/MANIFEST.MF
index 3923a70eab..a62dc0be26 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.headless.orient/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.headless.orient/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OrientDB transformation sink
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.headless.orient;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.instance.orient;bundle-version="2.9.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF
index a034567b15..305abc606d 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.headless.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Headless API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.headless.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.headless/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.headless/META-INF/MANIFEST.MF
index 2de8ba8d6f..4f99cd0502 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.headless/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.headless/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Headless Transformation
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.headless;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="11.0.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.headless/src/eu/esdihumboldt/hale/common/headless/impl/LoadSchemaAdvisor.java b/common/plugins/eu.esdihumboldt.hale.common.headless/src/eu/esdihumboldt/hale/common/headless/impl/LoadSchemaAdvisor.java
index 52bcd0f166..807395a51b 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.headless/src/eu/esdihumboldt/hale/common/headless/impl/LoadSchemaAdvisor.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.headless/src/eu/esdihumboldt/hale/common/headless/impl/LoadSchemaAdvisor.java
@@ -17,7 +17,9 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import eu.esdihumboldt.hale.common.core.io.impl.AbstractIOAdvisor;
 import eu.esdihumboldt.hale.common.core.io.project.model.Project;
@@ -26,7 +28,7 @@
 import eu.esdihumboldt.hale.common.schema.io.SchemaReader;
 import eu.esdihumboldt.hale.common.schema.model.Schema;
 import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace;
+import eu.esdihumboldt.hale.common.schema.model.impl.ResourceSchemaSpace;
 
 /**
  * Loads schemas and stores them in the advisor. As such an advisor instance may
@@ -36,7 +38,7 @@
  */
 public class LoadSchemaAdvisor extends AbstractIOAdvisor<SchemaReader> {
 
-	private final List<Schema> schemas = new ArrayList<Schema>();
+	private final Map<String, Schema> schemas = new HashMap<String, Schema>();
 
 	private final SchemaSpaceID ssid;
 
@@ -72,7 +74,7 @@ public void prepareProvider(SchemaReader provider) {
 	@Override
 	public void handleResults(SchemaReader provider) {
 		// add loaded schema to schema space
-		schemas.add(provider.getSchema());
+		schemas.put(provider.getResourceIdentifier(), provider.getSchema());
 
 		super.handleResults(provider);
 	}
@@ -81,7 +83,7 @@ public void handleResults(SchemaReader provider) {
 	 * @return the schemas
 	 */
 	protected List<Schema> getSchemas() {
-		return Collections.unmodifiableList(schemas);
+		return Collections.unmodifiableList(new ArrayList<>(schemas.values()));
 	}
 
 	/**
@@ -91,15 +93,14 @@ protected List<Schema> getSchemas() {
 	 */
 	public SchemaSpace getSchema() {
 		// TODO cache?
-		DefaultSchemaSpace dss = new DefaultSchemaSpace();
+		ResourceSchemaSpace dss = new ResourceSchemaSpace();
 
 		// add all schemas
-		for (Schema schema : schemas) {
-			// load information about mapping relevant types
-			SchemaIO.loadMappingRelevantTypesConfig(schema, ssid, project);
-			dss.addSchema(schema);
+		for (Map.Entry<String, Schema> entry : schemas.entrySet()) {
+//			 load information about mapping relevant types
+			SchemaIO.loadMappingRelevantTypesConfig(entry.getValue(), ssid, project);
+			dss.addSchema(entry.getKey(), entry.getValue());
 		}
-
 		return dss;
 	}
 
diff --git a/common/plugins/eu.esdihumboldt.hale.common.inspire/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.inspire/META-INF/MANIFEST.MF
index 0005806455..8445c22e41 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.inspire/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.inspire/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: INSPIRE constants and apps
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.inspire;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.graph.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.graph.test/META-INF/MANIFEST.MF
index bd38e7c902..6236951ec5 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.graph.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.graph.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Graphs Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.graph.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.instance.graph;bundle-version="2.9.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.graph/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.graph/META-INF/MANIFEST.MF
index 3456ca13df..10ba64c0ba 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.graph/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.graph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Graphs
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.graph
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.tinkerpop.blueprints.core;bundle-version="2.5.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.groovy.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.groovy.test/META-INF/MANIFEST.MF
index 4946dab804..0501620165 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.groovy.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Groovy Instance API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Fragment-Host: eu.esdihumboldt.hale.common.instance.groovy;bundle-version="2.7.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.groovy/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.groovy/META-INF/MANIFEST.MF
index 1bf65dd0ba..dbd39ae5fa 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.groovy/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Groovy Instance API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="11.0.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.index/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.index/META-INF/MANIFEST.MF
index bea15f276f..fbe69bad31 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.index/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.index/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Indexes
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.index;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="17.0.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF
index bebbc4a890..02689a1884 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.orient/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance model based on Orient DB
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.orient;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.instance;bundle-version="2.5.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF
index 9b8fe6c9df..309e8358b7 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Instance API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.instance.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.instance;bundle-version="2.5.0",
  org.geotools;bundle-version="8.0.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF
index c4f48e0582..055006bfc7 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Instance API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="1.6.0",
  com.google.common.cache;version="17.0.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instance/plugin.xml b/common/plugins/eu.esdihumboldt.hale.common.instance/plugin.xml
index 142b6b58ed..449e44312d 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instance/plugin.xml
+++ b/common/plugins/eu.esdihumboldt.hale.common.instance/plugin.xml
@@ -52,6 +52,18 @@
             allowAll="false"
             class="org.locationtech.jts.geom.Coordinate">
       </allow>
+      <allow
+            allowAll="false"
+            class="org.locationtech.jts.geom.CoordinateXY">
+      </allow>
+      <allow
+            allowAll="false"
+            class="org.locationtech.jts.geom.CoordinateXYM">
+      </allow>
+      <allow
+            allowAll="false"
+            class="org.locationtech.jts.geom.CoordinateXYZM">
+      </allow>
       <allow
             allowAll="false"
             class="org.locationtech.jts.geom.Polygon">
diff --git a/common/plugins/eu.esdihumboldt.hale.common.instancevalidator/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.instancevalidator/META-INF/MANIFEST.MF
index a827f452e7..ecbf92e5b6 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.instancevalidator/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.instancevalidator/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Validation
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instancevalidator;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
  de.fhg.igd.slf4jplus,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.logback.config.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.logback.config.test/META-INF/MANIFEST.MF
index c19ab3b75d..59e4582a47 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.logback.config.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.logback.config.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Logback Test Configuration
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.logback.config.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: ch.qos.logback.classic;bundle-version="0.9.19"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: data harmonisation panel
diff --git a/common/plugins/eu.esdihumboldt.hale.common.lookup.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.lookup.test/META-INF/MANIFEST.MF
index 0ab91a3c36..f922339b1f 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.lookup.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.lookup.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Lookup Table Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.lookup.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Fragment-Host: eu.esdihumboldt.hale.common.lookup;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.lookup/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.lookup/META-INF/MANIFEST.MF
index be5b973b14..72b1268ffc 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.lookup/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.lookup/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Lookup Table API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.lookup;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.core;bundle-version="2.5.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF
index 942a1940ea..6ac74fc7e8 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.propertyaccessor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance PropertyAccessor
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.propertyaccessor
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: org.geotools;bundle-version="8.0.0.M1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.hale.common.instance.helper,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF
index 47874eda42..03e9d100d4 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.referencing.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for GeoTools Referencing extensions
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.referencing.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.3.7",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF
index c5b112ab72..4b7779819c 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.referencing/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Extensions to GeoTools Referencing
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.referencing;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Fragment-Host: org.geotools;bundle-version="12.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.groovy.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.groovy.test/META-INF/MANIFEST.MF
index 466f29c3da..e9029a6d64 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.groovy.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema Groovy API and Utilities Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Fragment-Host: eu.esdihumboldt.hale.common.schema.groovy;bundle-version="2.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.groovy/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.groovy/META-INF/MANIFEST.MF
index 7e75980e13..3b69800362 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.groovy/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema Groovy API and Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.1.5",
  eu.esdihumboldt.hale.common.schema;bundle-version="2.6.0"
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.persist.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.persist.test/META-INF/MANIFEST.MF
index e39e17f036..49d59a05b9 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.persist.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.persist.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema Persistence Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.persist.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.schema.persist;bundle-version="2.8.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.persist/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.persist/META-INF/MANIFEST.MF
index fd12324774..45d6e292c1 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.persist/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.persist/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema Persistence
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.persist;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.schema;bundle-version="2.8.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/XmlToSchema.groovy b/common/plugins/eu.esdihumboldt.hale.common.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/XmlToSchema.groovy
index b303007f8b..e411e4f4b4 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/XmlToSchema.groovy
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.persist/src/eu/esdihumboldt/hale/common/schema/persist/hsd/XmlToSchema.groovy
@@ -181,7 +181,7 @@ public class XmlToSchema implements HaleSchemaConstants {
 					}
 				}
 				else {
-					reporter.error(new IOMessageImpl("Could not find factory for constraint with type $id"))
+					reporter.error("Could not find factory for constraint with type $id")
 				}
 			}
 			else {
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.presets/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.presets/META-INF/MANIFEST.MF
index 63041a1f68..57813d61e5 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.presets/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.presets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema Presets Extension Point
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.presets;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="17.0.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema.test/META-INF/MANIFEST.MF
index e6019722a5..0dd6ad1a0e 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schema API Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.schema;bundle-version="2.6.0",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF
index cb055c0646..619d3e53a9 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Schema API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.schema;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base,
  com.google.common.collect;version="11.0.1",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/io/impl/LoadSchemaAdvisor.java b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/io/impl/LoadSchemaAdvisor.java
index 69d001a7e3..8705009351 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/io/impl/LoadSchemaAdvisor.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/io/impl/LoadSchemaAdvisor.java
@@ -22,7 +22,7 @@
 import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
 import eu.esdihumboldt.hale.common.schema.io.SchemaReader;
 import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace;
+import eu.esdihumboldt.hale.common.schema.model.impl.ResourceSchemaSpace;
 
 /**
  * I/O configuration based advisor for loading schemas, that collects loaded
@@ -32,7 +32,7 @@
  */
 public class LoadSchemaAdvisor extends ConfigurationIOAdvisor<SchemaReader> {
 
-	private final DefaultSchemaSpace schemaSpace = new DefaultSchemaSpace();
+	private final ResourceSchemaSpace schemaSpace = new ResourceSchemaSpace();
 	private final SchemaSpaceID ssid;
 
 	/**
@@ -56,7 +56,7 @@ public void prepareProvider(SchemaReader provider) {
 	 */
 	@Override
 	public void handleResults(SchemaReader provider) {
-		schemaSpace.addSchema(provider.getSchema());
+		schemaSpace.addSchema(provider.getResourceIdentifier(), provider.getSchema());
 	}
 
 	/**
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/constraint/type/factory/GeometryTypeFactory.java b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/constraint/type/factory/GeometryTypeFactory.java
index 86137a3baa..0ddc6132e7 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/constraint/type/factory/GeometryTypeFactory.java
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/constraint/type/factory/GeometryTypeFactory.java
@@ -45,18 +45,16 @@ public Value store(GeometryType constraint, TypeReferenceBuilder typeIndex) thro
 	@Override
 	public GeometryType restore(Value value, Definition<?> definition, TypeResolver typeIndex,
 			ClassResolver resolver) throws Exception {
-		Class<?> binding = resolver.loadClass(value.as(String.class), "org.locationtech.jts");
+		String className = value.as(String.class);
+		if (className.contains("com.vividsolutions.jts")) {
+			className = className.replace("com.vividsolutions.jts", "org.locationtech.jts");
+		}
 
-		if (binding == null) {
-			String s = value.as(String.class);
-			binding = resolver.loadClass(
-					s.replace("com.vividsolutions.jts", "org.locationtech.jts"),
-					"org.locationtech.jts");
+		Class<?> binding = resolver.loadClass(className, "org.locationtech.jts.jts-core");
 
-			if (binding == null) {
-				throw new IllegalStateException(
-						"Could not resolve geometry type " + value.as(String.class));
-			}
+		if (binding == null) {
+			throw new IllegalStateException(
+					"Could not resolve geometry type " + value.as(String.class));
 		}
 
 		return GeometryType.get((Class<? extends Geometry>) binding);
diff --git a/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/impl/ResourceSchemaSpace.java b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/impl/ResourceSchemaSpace.java
new file mode 100644
index 0000000000..9123628cb4
--- /dev/null
+++ b/common/plugins/eu.esdihumboldt.hale.common.schema/src/eu/esdihumboldt/hale/common/schema/model/impl/ResourceSchemaSpace.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.common.schema.model.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import eu.esdihumboldt.hale.common.schema.model.Definition;
+import eu.esdihumboldt.hale.common.schema.model.Schema;
+import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
+import eu.esdihumboldt.hale.common.schema.model.TypeConstraint;
+import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
+import eu.esdihumboldt.hale.common.schema.model.TypeIndex;
+import eu.esdihumboldt.hale.common.schema.model.constraint.type.MappingRelevantFlag;
+
+/**
+ * {@link SchemaSpace} implementation with resource Id.
+ * 
+ * @author Kapil Agnihotri
+ */
+public class ResourceSchemaSpace implements SchemaSpace {
+
+	private final Map<String, Schema> schemasMap = new HashMap<String, Schema>();
+
+	private Collection<TypeDefinition> allTypes;
+
+	private Collection<TypeDefinition> mappingRelevantTypes;
+
+	/**
+	 * Adds a schema.
+	 * 
+	 * @param resourceId resource id of the schema.
+	 * 
+	 * @param schema the schema to add
+	 * @return this schema space for chaining
+	 */
+	public ResourceSchemaSpace addSchema(String resourceId, Schema schema) {
+		synchronized (this) {
+			schemasMap.put(resourceId, schema);
+			if (allTypes != null) {
+				allTypes.addAll(schema.getTypes());
+			}
+			if (mappingRelevantTypes != null) {
+				mappingRelevantTypes.addAll(schema.getMappingRelevantTypes());
+			}
+		}
+		return this;
+	}
+
+	/**
+	 * Removes a schema.
+	 * 
+	 * @param resourceId resource id of the schema.
+	 * 
+	 * @return returns the schema to which this map previously associated the
+	 *         key, or null if the map contained no mapping for the key.
+	 */
+	public Schema removeSchema(String resourceId) {
+		Schema removed = schemasMap.remove(resourceId);
+
+		// re-initialize.
+		allTypes = null;
+		getTypes();
+		mappingRelevantTypes = null;
+		getMappingRelevantTypes();
+		return removed;
+
+	}
+
+	/**
+	 * @see TypeIndex#getTypes()
+	 */
+	@Override
+	public Collection<? extends TypeDefinition> getTypes() {
+		synchronized (this) {
+			if (allTypes == null) {
+				allTypes = new HashSet<TypeDefinition>();
+				for (Schema schema : schemasMap.values()) {
+					allTypes.addAll(schema.getTypes());
+				}
+			}
+			return allTypes;
+		}
+	}
+
+	/**
+	 * @see TypeIndex#getType(QName)
+	 */
+	@Override
+	public TypeDefinition getType(QName name) {
+		synchronized (this) {
+			for (Schema schema : schemasMap.values()) {
+				if (schema != null) {
+					TypeDefinition result = schema.getType(name);
+					if (result != null) {
+						return result;
+					}
+				}
+			}
+
+			return null;
+		}
+	}
+
+	/**
+	 * @see TypeIndex#getMappingRelevantTypes()
+	 */
+	@Override
+	public Collection<? extends TypeDefinition> getMappingRelevantTypes() {
+		synchronized (this) {
+			if (mappingRelevantTypes == null) {
+				mappingRelevantTypes = new HashSet<TypeDefinition>();
+				for (Schema schema : schemasMap.values()) {
+					mappingRelevantTypes.addAll(schema.getMappingRelevantTypes());
+				}
+			}
+			return mappingRelevantTypes;
+		}
+	}
+
+	/**
+	 * @see SchemaSpace#getSchemas()
+	 */
+	@Override
+	public Iterable<? extends Schema> getSchemas() {
+		return new ArrayList<Schema>(schemasMap.values());
+	}
+
+	/**
+	 * @param resourceId resource id of the schema.
+	 * @return schema.
+	 */
+	public Schema getSchemas(String resourceId) {
+		return schemasMap.get(resourceId);
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.common.schema.model.TypeIndex#toggleMappingRelevant(java.util.Collection)
+	 */
+	@Override
+	public void toggleMappingRelevant(Collection<? extends TypeDefinition> types) {
+		synchronized (this) {
+			for (TypeDefinition type : types) {
+				Schema container = null;
+				for (Schema schema : schemasMap.values())
+					if (schema.getTypes().contains(type)) {
+						container = schema;
+						break;
+					}
+				// toggle type in its schema
+				if (container != null)
+					container.toggleMappingRelevant(Collections.singletonList(type));
+				else {
+					// shouldn't happen, but to be safe toggle it in this case
+					// too
+					Definition<TypeConstraint> def = type;
+					((AbstractDefinition<TypeConstraint>) def).setConstraint(MappingRelevantFlag
+							.get(!type.getConstraint(MappingRelevantFlag.class).isEnabled()));
+				}
+				// was toggled, update own list
+				if (mappingRelevantTypes != null)
+					if (type.getConstraint(MappingRelevantFlag.class).isEnabled())
+						mappingRelevantTypes.add(type);
+					else
+						mappingRelevantTypes.remove(type);
+			}
+		}
+	}
+}
diff --git a/common/plugins/eu.esdihumboldt.hale.common.scripting/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.scripting/META-INF/MANIFEST.MF
index 0a9f74537d..63e893d9c0 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.scripting/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.scripting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Scripting API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.scripting;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  eu.esdihumboldt.hale.common.align
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.service.helper.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.service.helper.test/META-INF/MANIFEST.MF
index 0331ddad10..e4c4505d2b 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.service.helper.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.service.helper.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE UI service helper test
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.service.helper.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Fragment-Host: eu.esdihumboldt.hale.common.service.helper;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/common/plugins/eu.esdihumboldt.hale.common.service.helper/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.service.helper/META-INF/MANIFEST.MF
index 4301d634d7..8a1aaf88c8 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.service.helper/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.service.helper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Hale UI Service Implementer
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.service.helper
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: wetransform GmbH
 Import-Package: eu.esdihumboldt.hale.common.align.model,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF
index 64321bf874..29aa1b1cce 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.style/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Styles API
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.style;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.common.style.io,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.tasks/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.tasks/META-INF/MANIFEST.MF
index 231202350b..bbaca486b6 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.tasks/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.tasks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tasks
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.tasks;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.common.tasks,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.test.allure/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.test.allure/META-INF/MANIFEST.MF
index 367e749396..e90a4f9c9d 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.test.allure/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.test.allure/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Allure Test Integration
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.test.allure;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: ru.yandex.qatools.allure.junit-adaptor;bundle-version="1.5.0",
  de.fhg.igd.equinox.test.app
diff --git a/common/plugins/eu.esdihumboldt.hale.common.test.docker/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.test.docker/META-INF/MANIFEST.MF
index a877d3d767..ecf0db76a7 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.test.docker/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.test.docker/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Docker
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.test.docker
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.common.test.docker.Activator
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.fasterxml.jackson.annotation;version="2.3.2",
diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF b/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF
index 36894f7800..037aba0a10 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF
+++ b/common/plugins/eu.esdihumboldt.hale.common.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Support Project
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.test;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.osgi.util,
  eu.esdihumboldt.hale.common.align.io,
diff --git a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
index 0e035b5204..8f5b497b15 100644
--- a/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
+++ b/common/plugins/eu.esdihumboldt.hale.common.test/Tests.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Tests" uid="eu.esdihumboldt.hale.tests" id="eu.esdihumboldt.hale.common.test.Tests" application="de.fhg.igd.equinox.test" version="4.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="Tests" uid="eu.esdihumboldt.hale.tests" id="eu.esdihumboldt.hale.common.test.Tests" application="de.fhg.igd.equinox.test" version="4.1.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -22,7 +22,6 @@
    <windowImages/>
 
    <launcher name="hale_tests">
-      <solaris/>
       <win useIco="false">
          <bmp/>
       </win>
@@ -94,7 +93,6 @@
       <plugin id="de.fhg.igd.slf4jplus"/>
       <plugin id="de.fhg.igd.slf4jplus.logback"/>
       <plugin id="de.fhg.igd.slf4jplus.logback.appender" fragment="true"/>
-      <plugin id="de.interactive_instruments.xtraserver-config-util"/>
       <plugin id="de.odysseus.staxon"/>
       <plugin id="dom4j"/>
       <plugin id="eu.esdihumboldt.config.test" fragment="true"/>
@@ -211,6 +209,7 @@
       <plugin id="eu.esdihumboldt.hale.io.schematron"/>
       <plugin id="eu.esdihumboldt.hale.io.schematron.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.io.shp"/>
+      <plugin id="eu.esdihumboldt.hale.io.shp.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.io.validation"/>
       <plugin id="eu.esdihumboldt.hale.io.wfs"/>
       <plugin id="eu.esdihumboldt.hale.io.wfs.test"/>
@@ -221,8 +220,6 @@
       <plugin id="eu.esdihumboldt.hale.io.xsd.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.io.xslt"/>
       <plugin id="eu.esdihumboldt.hale.io.xslt.test"/>
-      <plugin id="eu.esdihumboldt.hale.io.xtraserver"/>
-      <plugin id="eu.esdihumboldt.hale.io.xtraserver.test" fragment="true"/>
       <plugin id="eu.esdihumboldt.hale.prefixmapper"/>
       <plugin id="eu.esdihumboldt.hale.ui"/>
       <plugin id="eu.esdihumboldt.hale.ui.codelist"/>
@@ -370,6 +367,7 @@
       <plugin id="org.eclipse.core.databinding.property"/>
       <plugin id="org.eclipse.core.expressions"/>
       <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.net"/>
       <plugin id="org.eclipse.core.runtime"/>
       <plugin id="org.eclipse.draw2d"/>
       <plugin id="org.eclipse.e4.core.commands"/>
@@ -524,4 +522,11 @@
       <plugin id="org.springframework.core" autoStart="true" startLevel="0" />
    </configurations>
 
+   <preferencesInfo>
+      <targetfile overwrite="false"/>
+   </preferencesInfo>
+
+   <cssInfo>
+   </cssInfo>
+
 </product>
diff --git a/cst/features/eu.esdihumboldt.cst.feature/feature.xml b/cst/features/eu.esdihumboldt.cst.feature/feature.xml
index 64510ddd36..c6443eb309 100644
--- a/cst/features/eu.esdihumboldt.cst.feature/feature.xml
+++ b/cst/features/eu.esdihumboldt.cst.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.cst.feature"
       label="Conceptual Schema Transformer Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.collector/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.collector/META-INF/MANIFEST.MF
index 480684864c..e40427d09c 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.collector/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.collector/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Collector functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.collector;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="17.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.core/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.core/META-INF/MANIFEST.MF
index f28daa8859..14dd582f50 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.core/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Core Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.2.0",
  groovy;bundle-version="1.8.6"
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.custom.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.custom.test/META-INF/MANIFEST.MF
index 0edc0d7cad..2c3e6b1e8a 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.custom.test/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.custom.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom Functions Tests
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.custom.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.cst.functions.custom;bundle-version="2.9.3",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.custom/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.custom/META-INF/MANIFEST.MF
index 5d74364223..66cacee74c 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.custom/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.custom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom transformation functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.custom;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.common.align.custom,
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF
index c715a96cca..3419c85acb 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Geometric Functions Tests
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.geometric.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: data harmonisation panel
 Import-Package: eu.esdihumboldt.cst.test,
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF
index dad4a47ccd..643e1834d8 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Geometric Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.geometric;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0",
  org.opengis,
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/build.properties b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/build.properties
index 6c480f39f1..fbb2dd21d2 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/build.properties
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/
+               icons/,\
+               help/
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/Calculate_Length.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/Calculate_Length.png
new file mode 100644
index 0000000000..e0062c4bf6
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/Calculate_Length.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/help.xhtml
new file mode 100644
index 0000000000..8bae29db6e
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/help.xhtml
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Calculate Length</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+The calculate length function computes the length of a given geometry in the source data and 
+assigns the resulting value to the target property. <br> 
+</br>
+<br> 
+</br>
+The example below shows how the length of the geometry contained in the LineString property of the River source dataset 
+is calculated and assigned to the length property of the Watercourse target dataset. The function is executed by 
+clicking the Finish button. <br>
+</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/CalculateLength/Calculate_Length.png" />
+
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/aggregate.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/aggregate.png
new file mode 100644
index 0000000000..d1e485323c
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/aggregate.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/help.xhtml
new file mode 100644
index 0000000000..8d4484503c
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/aggregate/help.xhtml
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Aggregate</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+The aggregate function combines the input source features to create MultiLineString, MultiPoint or MultiPolygon geometries. The aggregate function performs a check to ensure that the input features have the same source CRS. In the cases of input multi geometries, a new multi geometry is created.
+When different input geometry types are aggregated, you will receive a warning in the transformation log but the function will combine the geometries in a generic GeometryCollection.
+In the case of lines the aggregate function tries to combine them to create a MultiLineString in which the individual lines are connected (i.e. end vertex of one line is the start vertex of the next one).
+If this is not possible there is no guaranteed order in the MultiLineString.<br>
+ </br>
+The aggregate function is often used in combination with the type level merge function. The use of the aggregate function is necessary to combine the geometries to create multi geometries and avoid selecting just one geometry from the merged source geometries.
+ <br>
+	</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/aggregate/aggregate.png" /><br>
+	</br>
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_Input.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_Input.png
new file mode 100644
index 0000000000..035ab79bd7
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_Input.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_map.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_map.png
new file mode 100644
index 0000000000..a5f80dd8cf
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_map.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/help.xhtml
new file mode 100644
index 0000000000..73ce530f99
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/centroid/help.xhtml
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Centroid</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+This function is used to create a centroid (or geometric center) for each feature geometry in the source dataset. The resulting 
+centroids are mapped to the target property as point features.<br> 
+</br>
+<br> 
+</br>
+In the example below, the centroid function was applied to populate the target geometry with the centroids of the source geometry features. 
+Note that for mapping centroids the target source has to have a point geometry.<br>
+</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_Input.png" /> <br/>
+
+The picture below shows the result of the centroid function, where for each element of the target source data (left) a centroid was added. <br/>
+
+<img src="../../eu.esdihumboldt.cst.functions.geometric/help/centroid/Centroid_map.png" /> <br/>
+
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_BoundingBox.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_BoundingBox.png
new file mode 100644
index 0000000000..e07351300c
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_BoundingBox.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_ConvexHull.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_ConvexHull.png
new file mode 100644
index 0000000000..732763d3ce
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_ConvexHull.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/help.xhtml
new file mode 100644
index 0000000000..14acbc5f5b
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/extent/help.xhtml
@@ -0,0 +1,34 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Compute Extent</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+The compute extent function uses the source data geometries to derive the geometric extent and map it to the target geometry.
+Three different options are available for extent computation: Bounding Box, Convex Hull and Union. Visual examples are 
+provided below.<br> 
+</br>
+<br> 
+</br>
+<strong>Bounding Box</strong><br>
+ </br>
+The bounding box option maps the smallest rectangle shape that encloses the source data geometries to the target data geometry. <br>
+</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_BoundingBox.png" />
+
+<br> 
+</br>
+<strong>Convex Hull</strong><br>
+ </br>
+The convex hull option maps the smallest convex shape that encloses the source data geometries to the target data geometry. <br>
+</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/extent/ComputeExtent_ConvexHull.png" />
+		
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/help.xhtml
new file mode 100644
index 0000000000..adb146c0e0
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/help.xhtml
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Interior Point</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+<strong>Lines</strong><br/>
+The interior point algorithm finds an interior vertex which is closest to the centroid of the line string.<br>
+ </br>
+<strong>Areas</strong><br/>
+The interior point algorithm computes sections along a horizontal scan line in the interior of the polygon. The final interior point is the midpoint of the widest computed section in the interior of the polygon.
+For properties with multiple geometries, the interior point function selects the first geometry.
+ <br/>
+	Source:<a href="https://locationtech.github.io/jts/jts-features.html"
+		target="_blank">JTS Technical Documentation</a><br/>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/interiorPoint.png" /><br/>
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/interiorPoint.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/interiorPoint.png
new file mode 100644
index 0000000000..7dc97ae788
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/interiorPoint/interiorPoint.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Buffer_Map.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Buffer_Map.png
new file mode 100644
index 0000000000..2f5f5375ac
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Buffer_Map.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_ChoseParameter.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_ChoseParameter.png
new file mode 100644
index 0000000000..9a498a3400
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_ChoseParameter.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Math.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Math.png
new file mode 100644
index 0000000000..2685411941
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Math.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_PlainValue.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_PlainValue.png
new file mode 100644
index 0000000000..bb5f5754f9
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_PlainValue.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/help.xhtml
new file mode 100644
index 0000000000..2d3ed477a8
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/network/help.xhtml
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Network expansion</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+The network expansion function creates a buffer around the geometry of the source data and applies it to the target data. The example 
+below shows a comparison of the unbuffered source data (left) to the buffered target data (right). <br/>
+
+<img src="../../eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Buffer_Map.png" /> <br/>
+
+<strong>Defining the buffer width</strong><br/>
+
+The buffer width can be specified either by a plain value, a mathematical expression or a groovy script.<br>
+</br>
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_ChoseParameter.png" /> <br/>
+		
+<strong>Plain value</strong><br>
+ </br>
+
+To define the buffer size using a plain value, enter the value of the desired buffer size (e.g. 500) in the function dialog.<br/>
+
+<img src="../../eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_PlainValue.png" /> <br/>
+
+<strong>Mathematical expression</strong><br>
+ </br>
+To apply a mathematical expression, a variable need to be added in the first step so that it can be used in the buffer 
+width expression in the second step. In the example below the variable 'width' was added and multiplied by the value 2 to 
+create a buffer around the source geometry. <br/>
+
+<img src="../../eu.esdihumboldt.cst.functions.geometric/help/network/NetworkExpansion_Math.png" /> <br/>
+
+<strong>Groovy script</strong><br>
+ </br>
+Similar to the mathematical expression, a groovy script can be applied to create the desired buffer for the target data. <br/>
+
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/help.xhtml
new file mode 100644
index 0000000000..05a9bb0b32
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/help.xhtml
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Spatial Join</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+Spatial joins can join objects from multiple feature types together based on the spatial relationship between their geometries.
+Spatial joins support the relation types contains, covered by, covers, crosses, equals, intersects, overlaps, touches, and within.<br>
+</br>
+Spatial joins are implemented based on the DE-9IM model.<br>
+</br>
+CONTAINS: Every point of the argument geometry is a point of this geometry, and the interiors of the two geometries have at least one point in common. Geometries do not contain their boundary.
+If a geometry A is a subset of the points in the boundary of a geometry B, <code>B.contains(A) = false</code>.
+CONTAINS is the converse of WITHIN.<br>
+</br>
+COVEREDBY: Every point of this geometry is a point of the argument geometry.
+This predicate is similar to WITHIN but is more inclusive (i.e. returns true for more cases).
+COVEREDBY is the converse of COVERS<br>
+</br>
+COVERS: Every point of the argument geometry is a point of this geometry. This predicate is similar to CONTAINS but is more inclusive (i.e. returns true for more cases). Unlike CONTAINS it does not distinguish between points in the boundary and in the interior of geometries. For most situations, COVERS should be used in preference to CONTAINS.
+COVERS is the converse of COVEREDBY.<br>
+</br>
+CROSSES: The geometries have some but not all interior points in common.<br>
+</br>
+EQUALS: Tests whether this geometry is topologically equal to the argument geometry.<br>
+</br>
+INTERSECTS: The geometries have at least one point in common.<br>
+</br>
+OVERLAPS: The geometries have at least one point each not shared by the other (or equivalently neither covers the other), they have the same dimension, and the intersection of the interiors of the two geometries has the same dimension as the geometries themselves.<br>
+</br>
+TOUCHES: The geometries have at least one point in common, but their interiors do not intersect.<br>
+</br>
+WITHIN: Every point of this geometry is a point of the argument geometry, and the interiors of the two geometries have at least one point in common. The boundary of the geometry is not within the geometry.
+If a geometry A is a subset of the points in the boundary of a geometry B, <code>A.within(B) = false</code>.
+WITHIN is converse of CONTAINS<br>
+</br>
+Source:<a href="https://locationtech.github.io/jts/jts-features.html"
+	target="_blank">JTS Technical Documentation</a><br>
+	</br>
+
+		<img src="../../eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join.png" /><br>
+	</br>
+	<img src="../../eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join_mapping.png" /><br>
+</br>
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join.png
new file mode 100644
index 0000000000..f99836f537
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join_mapping.png b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join_mapping.png
new file mode 100644
index 0000000000..983c070b3d
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/help/spatialJoin/spatial_join_mapping.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/plugin.xml b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/plugin.xml
index 3278d27058..b9a215cf2e 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.geometric/plugin.xml
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.geometric/plugin.xml
@@ -86,6 +86,7 @@
             cellExplanation="eu.esdihumboldt.cst.functions.geometric.NetworkExpansionExplanation"
             description="Creates a buffer on a geometry."
             icon="icons/geometry.png"
+            help = "help/network/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.networkexpansion"
             name="Network Expansion">
          <targetProperties>
@@ -129,6 +130,7 @@
             cellExplanation="eu.esdihumboldt.cst.functions.geometric.CalculateLengthExplanation"
             description="Calculate the length of a geometry."
             icon="icons/geometry.png"
+            help = "help/CalculateLength/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.calculatelength"
             name="Calculate Length">
          <targetProperties>
@@ -185,6 +187,7 @@
             cellExplanation="eu.esdihumboldt.cst.functions.geometric.CentroidExplanation"
             description="Calculates the centroid of a given geometry."
             icon="icons/geometry.png"
+            help = "help/centroid/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.centroid"
             name="Centroid">
          <targetProperties>
@@ -208,6 +211,7 @@
             category="eu.esdihumboldt.cst.functions.geometric"
             description="Compute geometric extent based on all input geometries. The options Bounding Box, Convex Hull and Union are possible."
             icon="icons/geometry.png"
+            help = "help/extent/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.extent"
             name="Compute Extent">
          <targetProperties>
@@ -253,6 +257,7 @@
             category="eu.esdihumboldt.cst.functions.geometric"
             description="Aggregate similar input geometries"
             icon="icons/geometry.png"
+            help="help/aggregate/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.aggregate"
             name="Aggregate">
          <targetProperties>
@@ -325,6 +330,7 @@
             cellExplanation="eu.esdihumboldt.cst.functions.geometric.interiorpoint.InteriorPointExplanation"
             description="Computes an interior point of a geometry (up to 2D). An interior point is guaranteed to lie in the interior of the geometry, if it is possible to calculate such a point exactly. Otherwise, the point may lie on the boundary of the geometry (e.g. if the geometry is a line)."
             icon="icons/geometry.png"
+            help="help/interiorPoint/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.interiorPoint"
             name="Interior Point">
          <targetProperties>
@@ -347,6 +353,7 @@
       <typeFunction
             category="eu.esdihumboldt.cst.functions.geometric"
             icon="icons/geometry.png"
+            help="help/spatialJoin/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.geometric.spatialjoin"
             name="Spatial Join">
          <targetTypes>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers.test/META-INF/MANIFEST.MF
index 4311763052..b0a3c6dce2 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers.test/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for general groovy helper functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.groovy.helpers.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.cst.functions.groovy.helpers;bundle-version="2.9.5",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers/META-INF/MANIFEST.MF
index de8543563e..4f1d2d4ee6 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy.helpers/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Helper Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.groovy.helpers;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.cst.functions.groovy;bundle-version="2.9.3",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
index a3e63294f1..58ed9ea987 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Groovy transformation function
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.collect;version="9.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF
index 9df1004a3c..5bd43a68dc 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.inspire/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Inspire Transformation Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.inspire;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0"
 Import-Package: com.google.common.base;version="9.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.numeric/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.numeric/META-INF/MANIFEST.MF
index 704534903f..a951b242d2 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.numeric/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.numeric/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Numeric Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.numeric;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0"
 Import-Package: com.google.common.base;version="9.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.string/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.functions.string/META-INF/MANIFEST.MF
index 040e96cded..3e9c0da6cd 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.string/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.string/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: String Transformation Functions
 Bundle-SymbolicName: eu.esdihumboldt.cst.functions.string;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.collect;version="9.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/DateExtraction.png b/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/DateExtraction.png
new file mode 100644
index 0000000000..3b64afb0eb
Binary files /dev/null and b/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/DateExtraction.png differ
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/help.xhtml b/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/help.xhtml
new file mode 100644
index 0000000000..3606f4f460
--- /dev/null
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.string/help/date/help.xhtml
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Date extraction</title>
+</head>
+<body>
+<div id ="help">
+	<h4>General explanation</h4>
+	<p>
+The date extraction function enables users to extract a date from a string type in the source data and assign the value to the target attribute.<br>
+ </br>
+ <br/>
+The date format must be specified by the user to achieve the correct result. In the example below the date is specified by month (MM), 
+day of month (dd) and year (yyyy).<br>
+	</br>
+		<img src="../../eu.esdihumboldt.cst.functions.string/help/date/DateExtraction.png" /><br>
+	</br>
+	</p>
+</div>
+</body>
+</html>
diff --git a/cst/plugins/eu.esdihumboldt.cst.functions.string/plugin.xml b/cst/plugins/eu.esdihumboldt.cst.functions.string/plugin.xml
index c94244f8c8..fcdca78889 100644
--- a/cst/plugins/eu.esdihumboldt.cst.functions.string/plugin.xml
+++ b/cst/plugins/eu.esdihumboldt.cst.functions.string/plugin.xml
@@ -22,6 +22,7 @@
             category="eu.esdihumboldt.hale.align.general"
             description="Extracts a date from a string type"
             cellExplanation="eu.esdihumboldt.cst.functions.string.DateExtractionExplanation"
+            help = "help/date/help.xhtml"
             identifier="eu.esdihumboldt.cst.functions.string.dateextraction"
             name="Date extraction">
          <sourceProperties>
diff --git a/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF
index 63bcafb460..5116bc151c 100644
--- a/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Conceptual Schema Transformer Tests
 Bundle-SymbolicName: eu.esdihumboldt.cst.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.cst;bundle-version="2.5.0",
  eu.esdihumboldt.hale.common.align;bundle-version="2.5.0",
diff --git a/cst/plugins/eu.esdihumboldt.cst/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.cst/META-INF/MANIFEST.MF
index b06285d07a..b237812bf6 100644
--- a/cst/plugins/eu.esdihumboldt.cst/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.cst/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Conceptual Schema Transformer
 Bundle-SymbolicName: eu.esdihumboldt.cst;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="11.0.1",
  com.google.common.collect;version="9.0.0",
diff --git a/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF b/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF
index 7b222bc842..40c18bd99c 100644
--- a/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF
+++ b/cst/plugins/eu.esdihumboldt.hale.common.instance.index.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Index Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.common.instance.index.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dummy/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dummy/META-INF/MANIFEST.MF
index ae0f326b5a..04a8adfa33 100644
--- a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dummy/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dummy/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Dummy Functions Documentation
 Bundle-SymbolicName: eu.esdihumboldt.cst.doc.functions.dummy;singleton:=true
 Fragment-Host: eu.esdihumboldt.cst.doc.functions;bundle-version="2.5.0"
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0"
 Bundle-Vendor: data harmonisation panel
diff --git a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF
index 719179c487..60f693e4a2 100644
--- a/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.cst.doc.functions.dynamic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Function Reference
 Bundle-SymbolicName: eu.esdihumboldt.cst.doc.functions.dynamic;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.cst.doc.functions
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align;bundle-version="2.5.0",
diff --git a/doc/plugins/eu.esdihumboldt.cst.doc.functions/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.cst.doc.functions/META-INF/MANIFEST.MF
index 2fe676d190..bd66c90240 100644
--- a/doc/plugins/eu.esdihumboldt.cst.doc.functions/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.cst.doc.functions/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Functions Documentation
 Bundle-SymbolicName: eu.esdihumboldt.cst.doc.functions;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.cst.doc.functions
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product
index b395fecfef..baacf999d9 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.application/Infocenter.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="halestudio Infocenter" uid="eu.esdihumboldt.hale.infocenter" id="eu.esdihumboldt.hale.doc.application.InfoCenter" application="eu.esdihumboldt.hale.doc.application.infocenterApplication" version="4.0.0.qualifier" useFeatures="false" includeLaunchers="true">
+<product name="halestudio Infocenter" uid="eu.esdihumboldt.hale.infocenter" id="eu.esdihumboldt.hale.doc.application.InfoCenter" application="eu.esdihumboldt.hale.doc.application.infocenterApplication" version="4.1.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
@@ -81,7 +81,6 @@
       <plugin id="eu.esdihumboldt.hale.doc.user.ioproviders"/>
       <plugin id="eu.esdihumboldt.hale.doc.user.views.styledmap"/>
       <plugin id="eu.esdihumboldt.hale.doc.util"/>
-      <plugin id="eu.esdihumboldt.hale.doc.xtraserver"/>
       <plugin id="eu.esdihumboldt.hale.io.csv"/>
       <plugin id="eu.esdihumboldt.hale.io.gml"/>
       <plugin id="eu.esdihumboldt.hale.io.gml.geometry"/>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.application/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.application/META-INF/MANIFEST.MF
index 409e696a49..e9d02eae61 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.application/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Infocenter
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.application;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.help;bundle-version="3.5.100",
  org.eclipse.help.base;bundle-version="3.6.1"
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.dev/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.dev/META-INF/MANIFEST.MF
index 0b1a15912b..8fc3054574 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.dev/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.dev/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Developer Guide
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.dev;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user.examples.meridian2/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.user.examples.meridian2/META-INF/MANIFEST.MF
index 658d245cab..9474e2bb98 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user.examples.meridian2/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user.examples.meridian2/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Meridian2 based example projects
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user.examples.meridian2;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: eu.esdihumboldt.hale.doc.user.examples;bundle-version="2.5.0"
 Bundle-Vendor: data harmonisation panel
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user.examples/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.user.examples/META-INF/MANIFEST.MF
index 1b4067b447..bfd747f1d0 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user.examples/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Example Projects Help
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user.examples;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100",
  org.eclipse.core.runtime;bundle-version="3.7.0"
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user.ioproviders/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.user.ioproviders/META-INF/MANIFEST.MF
index e72dfecd2b..76d62b74f9 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user.ioproviders/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user.ioproviders/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help on Instance I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user.ioproviders;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
  de.fhg.igd.slf4jplus,
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.user/META-INF/MANIFEST.MF
index 309aeb810a..fc37e0da5b 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE User Guide
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Require-Bundle: org.eclipse.help
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/functions.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/functions.html
index 41681e442f..7227c1df58 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/functions.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/functions.html
@@ -20,9 +20,9 @@ <h1>Functions</h1>
 		parameters.
 	</p>
 	<p class="Note">
-		<strong>Note:</strong> The functions available in <i>hale studio</i> represent only
+		<strong>Note:</strong> The functions available in <i>hale»studio</i> represent only
 		a small subset of possible relations - if you find that you are not
-		able to express a relation through the given functions, <i>hale studio</i> offers an
+		able to express a relation through the given functions, <i>hale»studio</i> offers an
 		extension point to integrate additional functions.
 	</p>
 	<p>There are two basic types of functions, functions that represent
@@ -32,7 +32,7 @@ <h3>Type relations</h3>
 	<p>A type relation describes how types from the source schema are
 		to be translated to a type in the target schema.</p>
 	<p>
-		The most simple type relation in <i>hale studio</i> is represented by the <a
+		The most simple type relation in <i>hale»studio</i> is represented by the <a
 			href="PLUGINS_ROOT/eu.esdihumboldt.cst.doc.functions/functions/eu.esdihumboldt.hale.align.retype.html">Retype</a>
 		function, which expresses that a source and target type are
 		semantically equal. For the transformation this means that for each
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/project_vars.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/project_vars.html
index 64bec8fbe0..720acc5b1a 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/project_vars.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/project_vars.html
@@ -19,7 +19,7 @@ <h2>Define variables</h2>
 
 	<p>
 		Go to <i>Window</i>&rarr;<i>Settings</i> and then to <i>Project</i>&rarr;<i>Variables</i>
-		to define project variables from within halestudio. Any variable you
+		to define project variables from within hale»studio. Any variable you
 		add here is stored in the project when you next save it.
 	</p>
 	<div>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html
index 2fd2128081..c2d1b634da 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html
@@ -21,7 +21,7 @@ <h1>What is an Instance?</h1>
 		<img src="images/instance.png" class="fit">
 	</div>
 	<p>
-		When loading a source data set in <i>hale studio</i>, the data is partitioned
+		When loading a source data set in <i>hale»studio</i>, the data is partitioned
 		into instances. Those instances can be inspected in the <a
 			href="../views/source_data.html">Source Data</a> view. When a
 		mapping/alignment is defined, the transformation is executed on the
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_schema.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_schema.html
index 00ae10712f..ff92da4344 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_schema.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_schema.html
@@ -21,10 +21,10 @@ <h1>What is a Schema?</h1>
 			</ul></li>
 	</ul>
 	<p>
-		In <i>hale studio</i> we define the schema mapping on the conceptual level,
+		In <i>hale»studio</i> we define the schema mapping on the conceptual level,
 		between classes/types and properties. For the complete transformation
 		process however, information about the data format is needed. The
-		approach used in <i>hale studio</i> can deal with both kinds of schemas,
+		approach used in <i>hale»studio</i> can deal with both kinds of schemas,
 		abstracting a conceptual view for logical schemas, while using the
 		information from the logical schema for the transformation process.
 		For conceptual schemas, no transformation can be applied, but the
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/contributors.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/contributors.html
index 4b23da13af..ea41e004d5 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/contributors.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/contributors.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 	<h1>Contributors</h1>
-	<p>Thanks to all who contributed to make <i>hale studio</i> what it is!</p>
+	<p>Thanks to all who contributed to make <i>hale»studio</i> what it is!</p>
 	<div>
 		<table class="contributors">
 			<tr>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/confWorkbench.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/confWorkbench.html
index f67ec95698..ba9a77ff8b 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/confWorkbench.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/confWorkbench.html
@@ -7,14 +7,14 @@
 <body>
 	<h1>Configuring your workbench</h1>
 	<p>
-		When you start <i>hale studio</i> the first time, it will present you with
+		When you start <i>hale»studio</i> the first time, it will present you with
 		the <i>First steps</i> welcome page. It offers you to load an existing
 		project or to continue with the <a class="command-link"
 			href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=eu.esdihumboldt.hale.ui.firststeps.firststepsCS)")'>
 			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
-			alt="command link">Get started with hale studio</a>
+			alt="command link">Get started with hale»studio</a>
 		guide. After choosing either of those options the welcome page is
-		replaced with the <i>hale studio</i> workbench. You can also close the
+		replaced with the <i>hale»studio</i> workbench. You can also close the
 		welcome page manually.
 	</p>
 	<p>The workbench consists of</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/data_perspective.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/data_perspective.png
index c7b62feb3d..d356d3757c 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/data_perspective.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/data_perspective.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/default_perspective.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/default_perspective.png
index e1a2e6e3f7..7b50990b97 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/default_perspective.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/default_perspective.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help.html
index 6fa2ff0c91..9d51c4a759 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help.html
@@ -8,23 +8,23 @@
 </script>
 </head>
 <body>
-	<h1>How to use the <i>hale studio</i> help</h1>
-	<p>The <i>hale studio</i> help is available both online and in your version of
-		hale studio. In some help topics live actions are provided, that allow
+	<h1>How to use the <i>hale»studio</i> help</h1>
+	<p>The <i>hale»studio</i> help is available both online and in your version of
+		hale»studio. In some help topics live actions are provided, that allow
 		you to directly perform a specific task in your currently running
-		version of hale studio. Here is an example: <a class="command-link"
+		version of hale»studio. Here is an example: <a class="command-link"
 			href='javascript:liveAction("eu.esdihumboldt.hale.ui.firststeps", "eu.esdihumboldt.hale.ui.firststeps.ImportAction",
 	"eu.esdihumboldt.hale.io.schema.read.source")'><img
 			src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
 			alt="command link">Import source schema</a></p>
-	<p>In <i>hale studio</i> you have different means to access the help, you should
+	<p>In <i>hale»studio</i> you have different means to access the help, you should
 		know how to use them to be able to find the right help topics quickly:</p>
 	<h2>Dynamic help</h2>
 	<p>
 		When you have selected a specific view (e.g. the <a
 			href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/views/schema_explorer.html">Schema
 			Explorer</a>) you can press <i>F1</i> to find out what help topics are
-		associated to it. <i>hale studio</i> provides associated help topics for most of the
+		associated to it. <i>hale»studio</i> provides associated help topics for most of the
 		views and even for specific objects. You can select a mapping cell or
 		function and will be presented a link to the corresponding help topic
 		in the function reference.
@@ -40,7 +40,7 @@ <h2>Dynamic help</h2>
 	<h2>Help Browser</h2>
 	<p>Use the Help Browser if you want to get an overview on the help
 		and browse through tasks, views and the reference. The simplest way
-		to open the Help Browser is the <i>hale studio</i> toolbar:</p>
+		to open the Help Browser is the <i>hale»studio</i> toolbar:</p>
 	<div>
 		<img src="help_toolbar.png">
 	</div>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help_browser.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help_browser.png
index e603307111..6c51cd23fe 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help_browser.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/help_browser.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/install_plugins.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/install_plugins.html
index 7bbabc7ac9..a7c1c5ad34 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/install_plugins.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/install_plugins.html
@@ -7,18 +7,18 @@
 <body>
 	<h1>Installing plugins</h1>
 	<p>
-		Since version 3.5, hale studio supports the installation of plugins
+		Since version 3.5, hale»studio supports the installation of plugins
 		via update sites. Update sites can be hosted on the internet
 		or reside on your local disk.
 	</p>
   <p>
-		hale studio connectivity plugins enable users to directly access data in Oracle databases and ESRI File Geodatabases
+		hale»studio connectivity plugins enable users to directly access data in Oracle databases and ESRI File Geodatabases
 		using the Oracle Database Reader/Writer and the FileGeodatabase Reader. The connectivity plugins are available to users with a
-		<a href="https://www.wetransform.to/products/halestudiopro/">hale studio pro package</a>. For more information, please contact
+		<a href="https://www.wetransform.to/products/halestudiopro/">hale»studio pro package</a>. For more information, please contact
 		wetransform at <b>info@wetransform.to</b>.
   </p>
 	<p>
-		To install a new hale studio plugin, open the software installation dialog
+		To install a new hale»studio plugin, open the software installation dialog
 		via the <code>Help|Install new software...</code> menu item and select the
 		appropriate update site from the list.
 	</p>
@@ -48,7 +48,7 @@ <h1>Installing plugins</h1>
 		installation.
 	</p>
 	<p>
-		In case you are installing unsigned plugins, hale studio will issue a security warning.
+		In case you are installing unsigned plugins, hale»studio will issue a security warning.
 		Click <code>Install anyway</code> to proceed with the installation.
 	</p>
 	<div>
@@ -56,7 +56,7 @@ <h1>Installing plugins</h1>
 			style="max-width: 75%; display: block; margin-left: auto; margin-right: auto;">
 	</div>
 	<p>
-		Once the installation is completed, hale studio will ask you to restart the application
+		Once the installation is completed, hale»studio will ask you to restart the application
 		to apply the changes. The restart is necessary for the newly installed plugins to be
 		available.
 </body>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/main_workflow.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/main_workflow.html
index bed935874c..b38d21b9a0 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/main_workflow.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/main_workflow.html
@@ -10,15 +10,15 @@
 <body>
 	<h1>First steps in hale studio</h1>
 	<p>
-		<i>hale studio</i> is an application that strives to assist you in creating
+		<i>hale»studio</i> is an application that strives to assist you in creating
 		schema mappings, allowing the transformation of data that conforms to
-		the source schema to data that is compliant to the target schema. <i>hale studio</i>
+		the source schema to data that is compliant to the target schema. <i>hale»studio</i>
 		combines both the mapping creation and the transformation,
 		facilitating an interactive mapping by giving feedback on each change
 		to the mapping by transforming a given sample data set.
 	</p>
 	<p>
-		A schema in <i>hale studio</i> is a collection of classes/types with
+		A schema in <i>hale»studio</i> is a collection of classes/types with
 		well-defined properties/attributes. Schemas may be complex, i.e. the
 		properties may again have properties themselves. Before starting with
 		the mapping creation you should familiarize yourself with the source
@@ -37,7 +37,7 @@ <h1>First steps in hale studio</h1>
 		online - or you can follow the instructions in the
 		<a class="command-link"
 			href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=eu.esdihumboldt.hale.ui.firststeps.firststepsCS)")'>
-			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="command link">Get started with hale studio</a> guide.
+			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png" alt="command link">Get started with hale»studio</a> guide.
 			It will show you a simple example project and get you going on starting
 			your own alignment project.
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten.png
index e282d298b0..8fb6b511a2 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten_perspective.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten_perspective.html
index 3a605f1d7e..8f695606ee 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten_perspective.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/thorsten_perspective.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Thorsten perspective</h1>
 	<p>The Thorsten perspective is how Thorsten works most efficiently
-		with hale studio. He likes to have schemas, data and the alignment in his
+		with hale»studio. He likes to have schemas, data and the alignment in his
 		reach all the time. For creating the alignment he prefers an approach
 		driven by sample data, so the data views and the map view play an
 		important role in his favorite perspective.</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/workbench.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/workbench.png
index 5e75b5b242..050b732a1e 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/workbench.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/getting_started/workbench.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_HALE.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_HALE.html
index d0ae244362..447cecb32d 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_HALE.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_HALE.html
@@ -2,16 +2,16 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>hale studio - The HUMBOLDT Alignment Editor</title>
+<title>hale»studio - The HUMBOLDT Alignment Editor</title>
 </head>
 <body>
 	<h1>hale studio - The HUMBOLDT Alignment Editor</h1>
 
 	<p>The mapping of elements such as Feature Types and Attributes of
 		one conceptual schema (e.g. GML Application Schemas, Database Schemas
-		or UML models) to another is a cornerstone of data harmonisation. The
-		HUMBOLDT Alignment Editor (hale studio) is a tool for defining and evaluating
-		conceptual schema mappings. <i>hale studio</i> allows domain experts to create
+		or UML models) to another is a cornerstone of data harmonization. The
+		HUMBOLDT Alignment Editor (hale»studio) is a tool for defining and evaluating
+		conceptual schema mappings. <i>hale»studio</i> allows domain experts to create
 		logically and semantically consistent mappings and to transform
 		geodata based on these mappings. Furthermore, a major focus is put on
 		the documentation of the schema transformation process and its
@@ -22,33 +22,33 @@ <h1>hale studio - The HUMBOLDT Alignment Editor</h1>
 		<img style="text-align: center; max-width: 95%" src="haleio.png">
 	</div>
 
-	<p>hale studio uses a high-level language for expressing the mappings.
+	<p>hale»studio uses a high-level language for expressing the mappings.
 		They can later be used by the Conceptual Schema Transformer processing
 		component to execute a data transformation, e.g. from a non-harmonised
 		data source to a INSPIRE-compliant data set.</p>
 
 	<p>To make this complex process more accessible to domain experts
-		and to increase the quality of the transformations, <i>hale studio</i> allows
+		and to increase the quality of the transformations, <i>hale»studio</i> allows
 		working with sample geodata (instances) for visualization and
 		validation.</p>
 
-	<p>The value that <i>hale studio</i> provides to data custodians, i.e.
+	<p>The value that <i>hale»studio</i> provides to data custodians, i.e.
 		maintainers of geographic datasets, is manifold:</p>
 	<ul>
-		<li>hale studio provides a unique declarative approach to making
+		<li>hale»studio provides a unique declarative approach to making
 			interactive schema mapping a less daunting task;</li>
-		<li>hale studio is based on a powerful conceptual-level mapping paradigm
+		<li>hale»studio is based on a powerful conceptual-level mapping paradigm
 			that makes mappings easier to understand and to maintain;</li>
-		<li>hale studio makes use of both the information in different
+		<li>hale»studio makes use of both the information in different
 			conceptual schemas and of geographic instances to ensure high-quality
 			mappings;</li>
-		<li>hale studio provides a rich, textual and graphical interface
+		<li>hale»studio provides a rich, textual and graphical interface
 			specifically adopted for GI Experts;</li>
-		<li>hale studio gives instant feedback about the progress of mapping
+		<li>hale»studio gives instant feedback about the progress of mapping
 			data from one schema to another, enabling throughout understanding of
 			the transformation process;</li>
-		<li>hale studio enables collaborative creation of mappings;</li>
-		<li>With hale studio, users can furthermore document known limitations
+		<li>hale»studio enables collaborative creation of mappings;</li>
+		<li>With hale»studio, users can furthermore document known limitations
 			of the mapping they are creating in the form of a unique Mismatch
 			Description Language.</li>
 	</ul>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_dhp.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_dhp.html
index 5149b16a8a..804991878b 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_dhp.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/introduction/introduction_dhp.html
@@ -15,7 +15,7 @@ <h1>wetransform</h1>
 		Through the unique <i>hale»studio</i> data harmonisation technology and our <i>hale»connect</i> cloud platform, we make spatial and environmental data accessible and usable and thus provide the foundation for data ecosystems around topics such as Environmental Reporting, UAV Flight Zone Management and Forest Transformation.</p>
 
 	<p>We offer a wide range of services around data harmonisation for national and international standards and cover the whole process from transformation to publishing and quality assurance. Find out more on our website at <a
-		href="www.wetransform.to" target="_blank">www.wetransform.to!</a>!</p>
+		href="https://www.wetransform.to" target="_blank">www.wetransform.to</a>!</p>
 	
 </body>
 </html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_0_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_0_0.xhtml
index d92c7816e5..ecf554a6b3 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_0_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_0_0.xhtml
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.0?</title>
+<title>What's new in hale»studio 3.0?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.0?</h1>
+	<h1>What's new in hale»studio 3.0?</h1>
 	<p>
 		It's time for a new major release, and it does come packed with many
 		new features and improvements. First, you might notice the new name
@@ -38,7 +38,7 @@
 	<p>The majority of these new features were made possible through our contracts with more than 20 customers. We'd like to thank you all for your support!</p>
 
 	<p class="Note">As this is a major release, projects created with
-		hale studio 3.0 may be incompatible with previous versions of HALE.</p>
+		hale»studio 3.0 may be incompatible with previous versions of HALE.</p>
 
 	<table border="0" cellpadding="15" cellspacing="0" class="news" id="3_0_0">
 		<tbody>
@@ -73,7 +73,7 @@
 			<tr id="new-groovy-features">
 				<td class="title">New Groovy Function Features</td>
 				<td class="content">Groovy Functions help when the functions we
-					ship with <i>hale studio</i> don't match specific requirements. To make
+					ship with <i>hale»studio</i> don't match specific requirements. To make
 					them more powerful, we have added several new capabilities. The
 					first of these is to output multiple features from a single Groovy
 					Retype, Groovy Merge or Groovy Join function. You can use this
@@ -144,7 +144,7 @@
 			<tr id="ms-access-reader">
 				<td class="title">Read MS Access Databases</td>
 				<td class="content">MS Access databases are one of the most
-					common formats used in reporting and statistics. In hale studio,
+					common formats used in reporting and statistics. In hale»studio,
 					you can now use MS Access databases to load source schemas and
 					source data.
 					<p>Thanks to the European Environmental Agency for funding this
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml
index 66f4d7def2..7957e76919 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_1_0.xhtml
@@ -3,12 +3,12 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.1?</title>
+<title>What's new in hale»studio 3.1?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.1?</h1>
+	<h1>What's new in hale»studio 3.1?</h1>
 
-	<p>hale studio 3.1 brings a couple of improvements and fixes. These
+	<p>hale»studio 3.1 brings a couple of improvements and fixes. These
 		are the most notable changes:</p>
 
 	<ul>
@@ -42,7 +42,7 @@
 
 			<tr id="mssql">
 				<td class="title">Microsoft SQL Server</td>
-				<td class="content">hale studio now supports Microsoft SQL
+				<td class="content">hale»studio now supports Microsoft SQL
 					Server as an additional type of database out of the box. This also
 					includes support for geography and geometry data types.
 					<p>
@@ -80,7 +80,7 @@
 
 				<td class="content">Code lists in SKOS format are in wide use -
 					not only for Linked Data. Now you can load SKOS resources as code
-					lists in hale studio, a SKOS concept represents an individual code.
+					lists in hale»studio, a SKOS concept represents an individual code.
 					<p>
 						<img src="3_1_0_images/skos.png" />
 					</p>
@@ -95,7 +95,7 @@
 					value restrictions in a schema, but also bring less safety in
 					respect to validation. To check the data you create in respect to
 					values from code lists you can now simply associate a code list to
-					a property - <i>hale studio</i> compares your data against the loaded code
+					a property - <i>hale»studio</i> compares your data against the loaded code
 					list and informs you in case different values are used.
 					<p>
 						<img src="3_1_0_images/codevalidation.png" />
@@ -110,7 +110,7 @@
 				<td class="content">On your source schema you can define
 					contexts for the mapping that are specified through a condition on
 					a type or property, or an index of a property. When you have source
-					data loaded in <i>hale studio</i> you can now see directly how many
+					data loaded in <i>hale»studio</i> you can now see directly how many
 					instances and values there are, that match these contexts.
 					<p>
 						<img src="3_1_0_images/contexts.png" />
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_2_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_2_0.xhtml
index abebd718f7..b718f0d37e 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_2_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_2_0.xhtml
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.2?</title>
+<title>What's new in hale»studio 3.2?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.2?</h1>
+	<h1>What's new in hale»studio 3.2?</h1>
 
 	<ul>
 		<li>Read interpolated Arc geometries from GML</li>
@@ -58,7 +58,7 @@
 				<td class="title">Multiple validators</td>
 				<td class="content">
 					<p>
-						hale studio's feature to validate exported XML and GML files has
+						hale»studio's feature to validate exported XML and GML files has
 						been extended. It is now possible to configure multiple validators.
 						Furthermore, a new type of validator, the <em>Project validator</em>
 						has been added which allows validation of the export result based
@@ -75,7 +75,7 @@
 				<td class="title">WFS request pagination support</td>
 				<td class="content">
 					<p>
-						When loading from WFS sources, <i>hale studio</i> now supports request 
+						When loading from WFS sources, <i>hale»studio</i> now supports request 
 						pagination, a capability that was introduced with the WFS 2.0 standard.
 						This allows loading larger datasets from a WFS where previously this
 						may have been limited by a server-side limit of retrievable features
@@ -91,8 +91,8 @@
 				<td class="title">Better UI support for project variables</td>
 				<td class="content">
 					<p>
-						The use of project variables, a feature that was introduced with hale 
-						studio 3.0, is now easier as several wizards in <i>hale studio</i> have been
+						The use of project variables, a feature that was introduced with hale»studio 3.0, 
+						is now easier as several wizards in <i>hale»studio</i> have been
 						extended to provide content assistance. Simply press Ctrl+Space when
 						inside a text field and choose the desired variable from a list. The
 						content assistant will take care of the correct syntax.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_0.xhtml
index 9b235053fb..bac427c55a 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_0.xhtml
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.3?</title>
+<title>What's new in hale»studio 3.3?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.3?</h1>
+	<h1>What's new in hale»studio 3.3?</h1>
 
 	<ul>
-		<li>Load and share <em>hale connect</em> transformation projects</li>
+		<li>Load and share <em>hale»connect</em> transformation projects</li>
 		<li>Spatial Join transformation function</li>
 		<li>Use arbitrary SQL queries as a source for schemas and data</li>
 	</ul>
@@ -33,11 +33,11 @@
 			</tr>
 
 			<tr id="haleconnect">
-				<td class="title">Load and share <em>hale connect</em> transformation projects</td>
+				<td class="title">Load and share <em>hale»connect</em> transformation projects</td>
 				<td class="content">
 					<p>
-						<em>hale studio</em> now comes with built-in support for the online
-						collaboration platform <em>hale connect</em>, where you can share 
+						<em>hale»studio</em> now comes with built-in support for the online
+						collaboration platform <em>hale»connect</em>, where you can share 
 						transformation projects and discuss alignments with your colleagues.
 						You can also browse transformation projects published by others,
 						extend them and share them back publicly or within your organization.
@@ -72,7 +72,7 @@
 				<td class="title">Arbitrary SQL queries as a source for schemas and data</td>
 				<td class="content">
 					<p>
-						Database support in <em>hale studio</em> was further extended by
+						Database support in <em>hale»studio</em> was further extended by
 						the possibility to tailor the schema and data import by custom
 						SQL queries.
 					</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_1.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_1.xhtml
index 402feb350d..13dbf74632 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_1.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_1.xhtml
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.3.1?</title>
+<title>What's new in hale»studio 3.3.1?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.3.1?</h1>
+	<h1>What's new in hale»studio 3.3.1?</h1>
 
 	<ul>
-		<li>Save transformation projects directly to <em>hale connect</em></li>
+		<li>Save transformation projects directly to <em>hale»connect</em></li>
 		<li>Partition GML output into multiple files</li>
 		<li>Support for PostgreSQL Materialized Views</li>
 	</ul>
@@ -33,14 +33,14 @@
 			</tr>
 
 			<tr id="save-to-hc">
-				<td class="title">Save transformation projects directly to <em>hale connect</em></td>
+				<td class="title">Save transformation projects directly to <em>hale»connect</em></td>
 				<td class="content">
 					<p>
-						<em>hale studio</em> extends its integration with the online
+						<em>hale»studio</em> extends its integration with the online
 						collaboration platform  by allowing to save projects directly to
-						<i>hale connect</i>. This allows for a true <i>online</i> workflow
+						<i>hale»connect</i>. This allows for a true <i>online</i> workflow
 						where your changes to a project that was saved to or loaded from
-						<i>hale connect</i> will be saved directly to the remote project
+						<i>hale»connect</i> will be saved directly to the remote project
 						without the need of another export. You can switch back to an
 						<i>offline</i> workflow at any time by saving your project to 
 						a local file on your computer. 
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_2.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_2.xhtml
index 38ea3e74d3..2971ee4f04 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_2.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_3_2.xhtml
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.3.2?</title>
+<title>What's new in hale»studio 3.3.2?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.3.2?</h1>
+	<h1>What's new in hale»studio 3.3.2?</h1>
 
 	<ul>
-		<li>Improved <i>hale connect</i> integration</li>
+		<li>Improved <i>hale»connect</i> integration</li>
 		<li>Enhanced CRS selection dialog</li>
 		<li>Character set detection for Shapefiles</li>
 		<li>Support for CQL functions in filter contexts</li>
@@ -34,15 +34,15 @@
 			</tr>
 
 			<tr id="hc-multi-orgs">
-				<td class="title">Improved <i>hale connect</i> integration</td>
+				<td class="title">Improved <i>hale»connect</i> integration</td>
 				<td class="content">
 					<p>
-						This release of <em>hale studio</em> improves the integration
-						with the online collaboration platform <i>hale connect</i> in
+						This release of <em>hale»studio</em> improves the integration
+						with the online collaboration platform <i>hale»connect</i> in
 						a couple of ways. Firstly, it is now possible to select which
 						organisation should own an uploaded transformation project for
 						cases where the currently logged-in user is member of more than
-						one organisation. Furthermore, <em>hale studio</em> now supports
+						one organisation. Furthermore, <em>hale»studio</em> now supports
 						a relogin with same or different credentials without having to
 						clear the credentials stored in preferences.
 					</p>
@@ -57,7 +57,7 @@
 				<td class="content">
 					<p>
 					    When loading source data, the user is prompted to provide the 
-					    CRS of the contained coordinates. <em>hale studio</em> now 
+					    CRS of the contained coordinates. <em>hale»studio</em> now 
 					    facilitates this by providing the content of the <em>srsName</em>
 					    attribute (in case of a GML source) or the WKT definition found
 					    in the projection file (<i>.prj</i>) that accompanies a Shape 
@@ -77,7 +77,7 @@
 						Importing a schema or source data from a Shapefile requires
 						the user to select the encoding of the Shapefile. In cases
 						where the Shape is accompanied by a Codepage file (<i>.cpg</i>),
-						<em>hale studio</em> can now read the encoding from that file
+						<em>hale»studio</em> can now read the encoding from that file
 						a prefill the character set selection dialog. 
 					</p>
 					<p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_4_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_4_0.xhtml
index 5a4e8fd00c..c1f6c3c20c 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_4_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_4_0.xhtml
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.4?</title>
+<title>What's new in hale»studio 3.4?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.4?</h1>
+	<h1>What's new in hale»studio 3.4?</h1>
 
 	<ul>
 		<li>Support for isolated workspaces in GeoServer App-Schema plugin</li>
@@ -84,7 +84,7 @@
 						it possible to migrate a source project based on another project 
 						providing a schema mapping to the project's source.
 						
-						In hale studio you can view tasks and messages generated by the
+						In hale»studio you can view tasks and messages generated by the
 						merge with the new <i>Tasks</i> view.
 					</p>
 					<p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_5_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_5_0.xhtml
index 7350998398..a456a6d3e9 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_5_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/3_5_0.xhtml
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 3.5?</title>
+<title>What's new in hale»studio 3.5?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 3.5?</h1>
+	<h1>What's new in hale»studio 3.5?</h1>
 
 	<ul>
 		<li>Deegree workspace configuration export</li>
@@ -37,7 +37,7 @@
 				<td class="content">
 					<p>
 						A bit like the Geoserver App-Schema and Xtraserver configuration, it is now also 
-						possible to generate deegree feature store configurations from hale studio alignments.
+						possible to generate deegree feature store configurations from hale»studio alignments.
 						This feature is currently not available in the command line interface.
 					</p>
 					<p>
@@ -53,7 +53,7 @@
 				<td class="title">GML output partitioning by spatial extent</td>
 				<td class="content">
 					<p>
-						The GML/XML writer in hale studio already supported several partitioning modes, 
+						The GML/XML writer in hale»studio already supported several partitioning modes, 
 						e.g. by Feature Type, or simply by feature count. We have now added support to 
 						partition output by spatial extent, using either a custom or a standard tile grid.
 					</p>
@@ -70,14 +70,14 @@
 				<td class="title">Support for plugin installation via update sites</td>
 				<td class="content">
 					<p>
-						The way to install plugins in hale studio has been improved: plugins can now be installed 
+						The way to install plugins in hale»studio has been improved: plugins can now be installed 
 						and updated from within the application via <code>Install new software...</code> in the
 						<code>Help</code> menu. More detailed instructions on how to use this new feature is
 						available on the <a href="../getting_started/install_plugins.html">Installing plugins</a> 
 						help page. 
 					</p>
 					<p> The App-Schema plugin by <i>Geosolutions</i> is the first plugin that uses the new installation 
-						method. Their corresponding update site is configured as a default in hale studio.
+						method. Their corresponding update site is configured as a default in hale»studio.
 					</p>
 					<p>
 						<img src="3_5_0_images/plugin-installation.png"></img>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_0_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_0_0.xhtml
index f622fa5534..2822f6fbbe 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_0_0.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_0_0.xhtml
@@ -3,10 +3,10 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <link rel="stylesheet" type="text/css" href="new.css" />
-<title>What's new in hale studio 4.0?</title>
+<title>What's new in hale»studio 4.0?</title>
 </head>
 <body>
-	<h1>What's new in hale studio 4.0?</h1>
+	<h1>What's new in hale»studio 4.0?</h1>
 
 	<ul>
 		<li>Major updates to the documentation and help</li>
@@ -31,7 +31,7 @@
 
 		<p>If you are a user of the <a
 			href="https://www.wetransform.to/products/halestudiopro/"
-			target="_blank">hale studio pro</a> plugins, you need to upgrade these as well.
+			target="_blank">hale»studio pro</a> plugins, you need to upgrade these as well.
 			Please reach out to the Servicedesk to get the new plug-ins.
 		</p>
 
@@ -53,7 +53,7 @@
 						It doesn't have issues such as 11 character attribute limits, unknown encodings, missing or incomplete projection files, and is very fast to access.
 					</p>
 					<p>
-						For these reasons, there have been several requests to add GeoPackage to the list of supported formats for hale studio.
+						For these reasons, there have been several requests to add GeoPackage to the list of supported formats for hale»studio.
 						We have now added a Reader and a Writer. The Writer can create GeoPackages from scratch, including the schema and metadata.
 						This means you can even use an XML schema and then write your data to a GeoPackage.
 						However, the required model transformations to make this work in complex cases are planned for the next release.
@@ -71,7 +71,7 @@
 				<td class="content">
 					<p>
 						XPlanung is a standard for all kinds of spatial plans that is currently implemented by thousands of agencies all across Germany.
-						To make the work with XPlanGML in hale studio easier, we have added two features - Schema Presets for all releveant XPlanGML versions,
+						To make the work with XPlanGML in hale»studio easier, we have added two features - Schema Presets for all relevant XPlanGML versions,
 						and a writer that creates XPlanAuszug files without requiring manual configuration.
 						This writer furthermore supports writing the data to one file per plan object - so you will get a file that has, for example the <code>BP_Plan</code>, the <code>BP_Bereich</code>
 						and all directly or indirectly referenced objects.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0.xhtml
new file mode 100644
index 0000000000..ed35167e19
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0.xhtml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<link rel="stylesheet" type="text/css" href="new.css" />
+<title>What's new in hale»studio 4.1?</title>
+</head>
+<body>
+	<h1>What's new in hale»studio 4.1?</h1>
+
+	<ul>
+		<li>Added support to select multiple files during the schema and the data import</li>
+		<li>Added support to remove a single schema from the project view</li>
+		<li>Added support to export the source and the transformed data to Shapefiles using GeoTools</li>
+		<li>Added presets for Environmental Noise Directive (END) schemas</li>
+		<li>Added support for create a spatial index when writing GeoPackage files</li>
+		<li>Various bug fixes and enhancements</li>
+	</ul>
+
+	<p>
+		For a full list of changes, please check out the <a
+			href="https://github.com/halestudio/hale/blob/master/CHANGELOG.md#410"
+			target="_blank">changelog on GitHub</a>
+	</p>
+
+	<p>To avoid any compatibility issues when using an existing workspace, we recommend starting with a fresh one when you install
+		hale»studio 4.1.0</p>
+		
+	<p>The development work for this release was co-funded by the European Health and Digital Executive Agency (HaDEA) under Action No 2018-EU-IA-0093.</p>
+
+	<table border="0" cellpadding="15" cellspacing="0" class="news" id="4_1_0">
+		<tbody>
+
+			<!-- New features -->
+			<tr>
+				<td class="section" colspan="2" id="4_1_0_Features" rowspan="1"><h2>New features</h2></td>
+			</tr>
+				
+			<tr id="multiple-files-import">
+				<td class="title">Import multiple files</td>
+				<td class="content">
+					<p>
+						Until now, users could import only a single source schema or a single source data file.
+						However, from this release, the user can select multiple files during the schema import
+						or when importing source data. This allows the user to save a significant amount of time
+						when working with multiple files of the same format.
+					</p>
+					<p>
+						<img src="4_1_0_images/import-multiple-files.png"></img>
+					</p>
+				</td>
+			</tr>
+
+			<tr id="Shapefiles-files-export">
+				<td class="title">Shapefile writer</td>
+				<td class="content">
+					<p>
+						This release adds the additional option to export source or transformed data as a Shapefile.
+					</p>
+					<p>
+						<img src="4_1_0_images/export-shapefile.png"></img>
+					</p>
+				</td>
+			</tr>
+
+		</tbody>
+	</table>
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/export-shapefile.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/export-shapefile.png
new file mode 100755
index 0000000000..f2cc6d026d
Binary files /dev/null and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/export-shapefile.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/import-multiple-files.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/import-multiple-files.png
new file mode 100755
index 0000000000..e0e858d3dc
Binary files /dev/null and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/new/4_1_0_images/import-multiple-files.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/cql_filter.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/cql_filter.html
index 7d9a8a9491..6c2cff6c73 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/cql_filter.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/cql_filter.html
@@ -8,8 +8,8 @@
 	<h1>CQL Filter</h1>
 	<p>
 		The Common Query Language (CQL) is used to define expressions
-		and filters in several parts of <i>hale studio</i>. It can be used to define
-		conditions on schema elements or to filter instances. <i>hale studio</i> also 
+		and filters in several parts of <i>hale»studio</i>. It can be used to define
+		conditions on schema elements or to filter instances. <i>hale»studio</i> also 
 		supports the extended CQL (ECQL) syntax as defined by Geotools. 
 	</p>
 
@@ -218,7 +218,7 @@ <h2>Example filters</h2>
 		project provided in the <a class="command-link"
 			href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=eu.esdihumboldt.hale.ui.firststeps.firststepsCS)")'>
 			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
-			alt="command link">Get started with hale studio</a> guide, using the
+			alt="command link">Get started with hale»studio</a> guide, using the
 		<a href="../views/transformed_data.html">Transformed Data view</a>.
 	</p>
 	<h3>Comparisons</h3>
@@ -234,7 +234,7 @@ <h3>Null</h3>
 	<p class="Code">details.address.city IS NOT NULL</p>
 	<h2>Supported filter operations</h2>
 	<p>Following is a list of filter operations that have been tested
-		with hale:</p>
+		with hale»studio:</p>
 		
 	<h3>Equal (=)</h3>
 	<div style="margin-left: 12px;">
@@ -334,7 +334,7 @@ <h3>Spatial operations (CONTAINS,BBOX,...)</h3>
 			literals defined must rely on source data having a specific reference
 			system that is previously known.</p>
 		<p>Note that spatial CQL filters only work on attributes that are
-			marked as geometry attributes in hale. It is right now not possible
+			marked as geometry attributes in hale»studio. It is right now not possible
 			to apply them to parent attributes of geometry attributes directly.</p>
 		<h4>Examples</h4>
 		<p class="Code">CONTAINS(areaAttr, POINT(2 0))</p>
@@ -420,7 +420,7 @@ <h3>Filter functions</h3>
 
 	<h3>Unsupported operations</h3>
 	
-	<p>These are CQL filter operations that have been verified to not work with hale:</p>
+	<p>These are CQL filter operations that have been verified to not work with hale»studio:</p>
 	<ul>
 		<li><strong>EXISTS</strong> - use <code>IS NOT NULL</code> instead if possible</li>
 		<li><strong>DOES-NOT-EXIST</strong> - use <code>IS NULL</code> instead if possible</li>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/geopackage.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/geopackage.html
new file mode 100644
index 0000000000..0e79a63f89
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/geopackage.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>GeoPackage Data Export</title>
+</head>
+<body>
+	<h1>GeoPackage Data Export</h1>
+	<p>
+		The GeoPackage Writer can create GeoPackages from scratch, including the schema and metadata.
+		You can also use an XML schema and write your data to a GeoPackage, however the writer does not support complex structures.
+		The XML schema must consist of simple properties or properties that directly use a geometry type.
+	</p>
+	<div>
+		<img src="images/geopackage.png" class="fit">
+	</div>
+
+	<br>
+	<!-- related concepts -->
+	<div>
+		<br> <img
+			src="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/images/ngrelc.png">
+		<p>
+			<a href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html">What is an Instance?</a>
+		</p>
+	</div>
+
+	<!-- related tasks: save transformed data -->
+	<div>
+		<br> <img
+			src="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/images/ngrelt.png">
+		<p>
+			<a href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html">Save the transformation result</a>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/html_mapping.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/html_mapping.html
index 4f760d9241..de2ee12baa 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/html_mapping.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/html_mapping.html
@@ -15,7 +15,7 @@ <h1>HTML Mapping Documentation</h1>
 		the example project from the <a class="command-link"
 			href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=eu.esdihumboldt.hale.ui.firststeps.firststepsCS)")'>
 			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
-			alt="command link">Get started with hale studio</a>
+			alt="command link">Get started with hale»studio</a>
 		guide is provided as an <a href="sample_documentation.html">example</a>.
 	</p>
 	<p>To create the mapping documentation for your project, export the
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/images/geopackage.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/images/geopackage.png
new file mode 100644
index 0000000000..83f43fa98b
Binary files /dev/null and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/images/geopackage.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/jdbc.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/jdbc.html
index c08e2a309f..6b85d41a50 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/jdbc.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/jdbc.html
@@ -6,10 +6,10 @@
 </head>
 <body>
 	<h1>Database Export</h1>
-	<p><i>hale studio</i> writes to databases using JDBC. hale studio
+	<p><i>hale»studio</i> writes to databases using JDBC. hale»studio
 		offers support for PostgreSQL and PostGIS databases out of the box,
 		support for other databases can be added through plug-ins.</p>
-	<p class="Note">The database export in this version of <i>hale studio</i> is
+	<p class="Note">The database export in this version of <i>hale»studio</i> is
 		deemed experimental. This means it does not have the full
 		functionality we want to provide for a database export feature.
 		However, within its limits it is functional and may be useful to you.</p>
@@ -26,7 +26,7 @@ <h1>Database Export</h1>
 			identifier assigned during transformation will be replaced by the
 			auto-generated value.</li>
 	</ul>
-	<p>When storing geometries in PostGIS, <i>hale studio</i> will try to detect the
+	<p>When storing geometries in PostGIS, <i>hale»studio</i> will try to detect the
 		spatial reference system associated to the target column and transform
 		them appropriately.</p>
 	<p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/mssql.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/mssql.html
index e30064fba9..99364439ab 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/mssql.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/mssql.html
@@ -7,15 +7,15 @@
 <body>
 	<h1>MsSQL Server Export</h1>
 	<p>
-		Support for MsSQL Server in <i>hale studio</i> is based on the generic <a
+		Support for MsSQL Server in <i>hale»studio</i> is based on the generic <a
 			href="jdbc.html">Database export</a> based on JDBC, and thus has the
-		same limitations. For instance <i>hale studio</i> needs the database schema to
+		same limitations. For instance <i>hale»studio</i> needs the database schema to
 		already exist in SQL server, thus you can only write to database that have 
 		already been prepared and loaded as target schema.
 	</p>
 	
 	<p>
-		<i>hale studio</i> supports writing both geometry and geography <a href="https://msdn.microsoft.com/en-us/library/bb933790(v=sql.110).aspx">spatial data types</a> 
+		<i>hale»studio</i> supports writing both geometry and geography <a href="https://msdn.microsoft.com/en-us/library/bb933790(v=sql.110).aspx">spatial data types</a> 
 		of MsSQL Server but if any objects does not contain spatial reference system then 
 		<b>(EPSG:4326)</b> will be used as a default reference system. 
 		However, within this limit it is functional and may be useful to you.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/sqlite.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/sqlite.html
index 46b7a6af77..e23bc6bd2b 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/sqlite.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/sqlite.html
@@ -7,13 +7,13 @@
 <body>
 	<h1>SQLite and SpatiaLite Export</h1>
 	<p>
-		Support for SQLite and SpatiaLite in <i>hale studio</i> is based on the generic <a
+		Support for SQLite and SpatiaLite in <i>hale»studio</i> is based on the generic <a
 			href="jdbc.html">Database export</a> based on JDBC, and thus has the
-		same limitations. For instance <i>hale studio</i> needs the database schema to
+		same limitations. For instance <i>hale»studio</i> needs the database schema to
 		already exist, thus you can only write to files that have already been
 		prepared and loaded as target schema.
 	</p>
-	<p class="Note">The database export in this version of <i>hale studio</i> is
+	<p class="Note">The database export in this version of <i>hale»studio</i> is
 		deemed experimental. This means it does not have the full
 		functionality we want to provide for a database export feature.
 		However, within its limits it is functional and may be useful to you.</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/wfs.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/wfs.html
index 8a34ef91ac..9b6328c464 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/wfs.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/wfs.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 	<h1>Transactional WFS</h1>
-	<p><i>hale studio</i> supports publishing your transformed GML data to a WFS with
+	<p><i>hale»studio</i> supports publishing your transformed GML data to a WFS with
 		support for transactions. Currently supported are Transactional Web
 		Feature Services following the OGC WFS 1.1.0 or WFS 2.0.0
 		specifications. There are two different providers for publishing to
@@ -25,7 +25,7 @@ <h1>Transactional WFS</h1>
 				<li>
 					<strong>Keep instances that reference each other together</strong>:
 					This is the default behaviour that used in previous versions of
-					<em>hale studio</em>. The partitioning is done based on the references 
+					<em>hale»studio</em>. The partitioning is done based on the references 
 					between features. Features that are connected are kept together so the 
 					WFS-T is able to retain those references.
 				</li>
@@ -37,7 +37,7 @@ <h1>Transactional WFS</h1>
 			</ul>
 		</li>
 	</ul>
-	<p class="Note">The publishing to WFS in this version of <i>hale studio</i> is
+	<p class="Note">The publishing to WFS in this version of <i>hale»studio</i> is
 		deemed experimental. This means it does not have the full
 		functionality we want to provide for a WFS publishing feature.
 		However, within its limits it is functional and may be useful to you.</p>
@@ -49,15 +49,15 @@ <h1>Transactional WFS</h1>
 			messages in the transformation and export reports. There is no
 			automatic recovery, features may have to be deleted manually if they
 			are not desired to be published.<br>
-		<br><i>hale studio</i> behaves like this because both transformation and GML
+		<br><i>hale»studio</i> behaves like this because both transformation and GML
 			export aim to provide you a result even if there are small errors or
 			inconsistencies.<br><br>
 		</li>
-		<li><i>hale studio</i> will not check the WFS Capabilities if the WFS
+		<li><i>hale»studio</i> will not check the WFS Capabilities if the WFS
 			supports any of the provided GML feature types.</li>
 	</ul>
 	<p>Target location for the WFS-T export is the POST URL for the
-		WFS Transaction operation. The <i>hale studio</i> user interface provides a helper to
+		WFS Transaction operation. The <i>hale»studio</i> user interface provides a helper to
 		determine that URL from the WFS capabilities.</p>
 	
 	<br>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xml_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xml_data.html
index 6baaa56cd6..f6f3c34c6c 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xml_data.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xml_data.html
@@ -25,7 +25,7 @@ <h1>XML Data Export</h1>
 		<img src="images/xml_export_root.png" title="Specify root element" class="fit">
 	</div>
 	<p>
-		When writing the transformed data, <i>hale studio</i> will try to find a
+		When writing the transformed data, <i>hale»studio</i> will try to find a
 		valid XML path to write each of the transformed instances. If there
 		are geometry objects contained in an instance, they are written as a
 		GML geometry if possible.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xplan_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xplan_data.html
new file mode 100644
index 0000000000..c78eed8c3f
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/export/xplan_data.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>XPlanGML Data Export</title>
+</head>
+<body>
+	<h1>XPlanGML Data Export</h1>
+	<p>
+		The support for exporting XPlanGML is covered by the <a
+			href="xml_data.html">XML Export</a>. The XPlanGML Writer creates XPlanAuszug files without requiring manual configuration.
+			The Writer also supports writing the data to one file per plan object - so you will get a file that has, for example the <code>BP_Plan</code>, the <code>BP_Bereich</code>
+			and all directly or indirectly referenced objects.
+	</p>
+
+	<br>
+	<!-- related concepts -->
+	<div>
+		<br> <img
+			src="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/images/ngrelc.png">
+		<p>
+			<a href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/concepts/what_is_instance.html">What is an Instance?</a>
+		</p>
+	</div>
+
+	<!-- related tasks: save transformed data -->
+	<div>
+		<br> <img
+			src="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/images/ngrelt.png">
+		<p>
+			<a href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html">Save the transformation result</a>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/csv.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/csv.html
index ddb29547d5..f08607e977 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/csv.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/csv.html
@@ -7,12 +7,12 @@
 <body>
 	<h1>CSV Import</h1>
 	<p>
-		Comma separated value (CSV) files can be used as a data source in <i>hale studio</i>,
+		Comma separated value (CSV) files can be used as a data source in <i>hale»studio</i>,
 		with the schema definition also being derived from the CSV file.
 	</p>
 	<h2>General CSV Import Options</h2>
 	<p>
-		When loading a CSV file, <i>hale studio</i> will try to auto-detect the
+		When loading a CSV file, <i>hale»studio</i> will try to auto-detect the
 		settings for reading the file, i.e. which character is used to
 		separate the values and what the quote and escape characters should
 		be. You can correct the settings manually by choosing other characters
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/geopackage.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/geopackage.html
new file mode 100644
index 0000000000..4543e044e4
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/geopackage.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>GeoPackage Data Import</title>
+</head>
+<body>
+	<h1>GeoPackage Data Import</h1>
+	<p>
+		<i>hale»studio</i> supports the import of GeoPackages.
+		The GeoPackage first needs to be imported as schema, and then as data.
+	</p>
+
+	<br />
+	<!-- related reference -->
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_data.html
index f9cef3912b..4648ca9153 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_data.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_data.html
@@ -21,7 +21,7 @@ <h1>GML Data Import</h1>
 
 	<h2>Load data from a WFS</h2>
 	<p>
-		<i>hale studio</i> offers the possibility to load data based on a WFS <i>GetFeature</i>
+		<i>hale»studio</i> offers the possibility to load data based on a WFS <i>GetFeature</i>
 		KVP request. You can specify the request URL manually or use the <i>...</i>
 		button to launch a wizard assisting you in building the URL from the service capabilities.
 	</p>
@@ -35,7 +35,7 @@ <h2>Load data from a WFS</h2>
 	<div>
 		<img src="images/wfs_data_bb.png" class="fit"></img>
 	</div>
-	<p>When loading from WFS sources, <i>hale studio</i> supports request pagination, a capability that
+	<p>When loading from WFS sources, <i>hale»studio</i> supports request pagination, a capability that
 	    was introduced with the WFS 2.0 standard. You can activate or deactivate request
 	    pagination on the <i>XML/GML settings</i> page. If activated, the number of features 
 	    that will be retrieved per request can also be set.
@@ -43,7 +43,7 @@ <h2>Load data from a WFS</h2>
 		<p>Even though pagination was introduced in the WFS 2.0 standard, there are
 		WFS server implementations available that support this feature for WFS 1.1.0 
 		requests as well. If you know that the queried WFS supports this and activate 
-		pagination, <i>hale studio</i> will paginate the requests also for WFS 1.1.0 requests. 
+		pagination, <i>hale»studio</i> will paginate the requests also for WFS 1.1.0 requests. 
 		</p>
 	<div>
 		<img src="images/wfs_data_settings.png" class="fit"></img>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_schema.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_schema.html
index 9cf689b8f3..926c666a90 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_schema.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/gml_schema.html
@@ -17,7 +17,7 @@ <h1>GML Application Schema Import</h1>
 	</div>
 	<h2>Load a schema from a WFS</h2>
 	<p>
-		<i>hale studio</i> offers the possibility to load a schema based on a WFS <i>DescribeFeatureType</i>
+		<i>hale»studio</i> offers the possibility to load a schema based on a WFS <i>DescribeFeatureType</i>
 		KVP request. You can specify the request URL manually or use the <i>...</i>
 		button to launch a wizard assisting you in building the URL based on the service capabilities.
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/jdbc.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/jdbc.html
index 1aca765d0a..98080533de 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/jdbc.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/jdbc.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 	<h1>Database Import</h1>
-	<p>Database schemas and data are imported in <i>hale studio</i> using JDBC. hale studio
+	<p>Database schemas and data are imported in <i>hale»studio</i> using JDBC. hale»studio
 		offers support for Microsoft SQL Server, PostgreSQL and PostGIS databases out of the box,
 		support for other databases can be added through plug-ins.</p>
 	<p>The database import currently has the following known limitations:</p>
@@ -53,7 +53,7 @@ <h2>Data import</h2>
 		those types that are marked as mapping relevant. <br>Before
 		loading the data it is recommended to enable the selection of a
 		sub-set as sample data (<i>First n instances per type</i>), so a
-		potentially big database is not loaded completely into <i>hale studio</i> just for
+		potentially big database is not loaded completely into <i>hale»studio</i> just for
 		the analysis and mapping. This can be enabled in the tool bar or the
 		project's source data settings.
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/mssql.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/mssql.html
index ccdc93378b..4ab1b6cfed 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/mssql.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/mssql.html
@@ -7,12 +7,12 @@
 <body>
 	<h1>MsSQL Server Import</h1>
 	<p>
-		<i>hale studio</i> supports MsSQL Server database (tested version 2012 and 2014) import like generic 
+		<i>hale»studio</i> supports MsSQL Server database (tested version 2012 and 2014) import like generic 
 		<a href="jdbc.html">Database import</a> based on JDBC. Thus has the same limitations.
 	</p>
 	
 	<p>
-		<i>hale studio</i> supports both geometry and geography <a href="https://msdn.microsoft.com/en-us/library/bb933790(v=sql.110).aspx">spatial data types</a> 
+		<i>hale»studio</i> supports both geometry and geography <a href="https://msdn.microsoft.com/en-us/library/bb933790(v=sql.110).aspx">spatial data types</a> 
 		of MsSQL Server but there are some limitations on curved <a href="https://msdn.microsoft.com/en-us/library/bb964711(v=sql.110).aspx#Anchor_1"> spatial data objects</a>. 
 	</p>
 	<p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/shapefile.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/shapefile.html
index c22bd1060d..2acecd8d01 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/shapefile.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/shapefile.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Shapefile (SHP) Import</h1>
 	<p>
-		Shapefiles can be used as a data source in <i>hale studio</i>, with the
+		Shapefiles can be used as a data source in <i>hale»studio</i>, with the
 		schema definition also being derived from the Shapefile. Before
 		importing a Shapefile as source data, you have to import it as source
 		schema.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/sqlite.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/sqlite.html
index 2882bc2c16..a737a91b04 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/sqlite.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/sqlite.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>SQLite and SpatiaLite Import</h1>
 	<p>
-		Support for SQLite and SpatiaLite in <i>hale studio</i> is based on the generic <a
+		Support for SQLite and SpatiaLite in <i>hale»studio</i> is based on the generic <a
 			href="jdbc.html">Database import</a> based on JDBC, and thus has the
 		same limitations. For convenience,
 		you can simply select a
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xls.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xls.html
index bbbb6228eb..a1be5dba56 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xls.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xls.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Excel File (XLS, XLSX) Import</h1>
 	<p>
-		Excel files can be used as a data source in <i>hale studio</i>. The 
+		Excel files can be used as a data source in <i>hale»studio</i>. The 
 		schema definition can/should also be derived from this excel file, 
 		by using a headline or user input to define attribute names.
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xml_schema.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xml_schema.html
index 8e91b7b816..d5f7e2e0e5 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xml_schema.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xml_schema.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>XML Schema Import</h1>
 	<p>
-		<i>hale studio</i> supports loading schemas from XML Schema Definition (XSD)
+		<i>hale»studio</i> supports loading schemas from XML Schema Definition (XSD)
 		files. XML elements and types will be analyzed in a given schema file,
 		as well as in the included and imported additional schemas. Complex
 		properties are supported, as well as cycles, substitutions, groups and
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xplan_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xplan_data.html
new file mode 100644
index 0000000000..efdb041132
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/import/xplan_data.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>XPlanGML Data Import</title>
+</head>
+<body>
+	<h1>XPlanGML Data Import</h1>
+	<p>
+		The <i>hale»studio</i> GML import supports XPlanGML. For more
+		information please see the <a href="gml_data.html">GML Data Import</a>
+	</p>
+
+	<br />
+	<!-- related reference -->
+	<div>
+		<br /> <img
+			src="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/images/ngrelr.png"></img>
+		<p>
+			<a href="gml_data.html">GML Data Import</a>
+		</p>
+	</div>
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/spatialite_common.xhtml b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/spatialite_common.xhtml
index abf7fef14e..4dbc8a681d 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/spatialite_common.xhtml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/reference/spatialite_common.xhtml
@@ -11,18 +11,18 @@
 			To support SpatiaLite the
 			<code>mod_spatialite</code>
 			extension for SQLite must be available. For Windows users the
-			extension is provided together with hale studio, for other
+			extension is provided together with hale»studio, for other
 			operating systems you may find it in your package manager or can
 			compile it yourself.
 		</p>
-		<p><i>hale studio</i> specifically supports version 3 and 4 of SpatiaLite, but
+		<p><i>hale»studio</i> specifically supports version 3 and 4 of SpatiaLite, but
 			should also work with previous versions. Please let us know if you
 			experience any problems working with your files.</p>
 			
 		<h3>SpatiaLite on Windows</h3>
 		<p>
-			<i>hale studio</i> ships with the SQLite extension <code>mod_spatialite</code> (Version 4.2.0),
-			which is available as DLLs in the main <i>hale studio</i> directory. You can
+			<i>hale»studio</i> ships with the SQLite extension <code>mod_spatialite</code> (Version 4.2.0),
+			which is available as DLLs in the main <i>hale»studio</i> directory. You can
 			replace the library and its dependencies with different versions, e.g. as provided on
 			the <a href="http://www.gaia-gis.it/gaia-sins/" target="_blank">project
 				page</a>.
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/example_projects.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/example_projects.png
new file mode 100644
index 0000000000..168d4ceb38
Binary files /dev/null and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/example_projects.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/resources_HALE.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/resources_HALE.html
new file mode 100644
index 0000000000..5454568f0a
--- /dev/null
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/resources/resources_HALE.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Resources and Support</title>
+</head>
+<body>
+	<h1>Resources and Support</h1>
+
+	<p>This section contains a list of links to a wide variety of helpful resources.</p>
+
+	<a href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/getting_started/main_workflow.html"
+		target="_blank">Absolute beginners should start here</a>
+
+	<p>The <i>Getting Started</i> section contains instructions on how to use the hale»studio help and how to navigate the UI. It also contains tutorial sections on core workflows in hale»studio.</p><br>
+	</br>
+
+	<a href="http://help.halestudio.org/latest/index.jsp"
+		target="_blank">Search for free text in the online help</a>
+
+	<p>The hale»studio help page offers free text search to help you find the information you are looking for.</p><br>
+	</br>
+
+	<p>hale»studio desktop software offers a number of example transformation projects that you can load directly. The example projects contain mappings which use a variety of the functions available in hale»studio.
+	The example projects are a great way to gain familiarity with common use scenarios.The example projects can be accessed from the <i>Help</i> menu in hale»studio.</p><br>
+	</br>
+
+	<div>
+		<img style="text-align: center; max-width: 95%" src="example_projects.png">
+	</div><br>
+	</br>
+
+
+	<a href="https://www.youtube.com/watch?v=BKNMV-Jp9HM"
+		target="_blank">Watch the introductory webinar</a>
+
+	<p>wetransform offers webinars on challenging topics throughout the year. Register for a webinar <a href="https://www.wetransform.to/services/workshops/"
+		target="_blank">on our website</a>.</p><br>
+	</br>
+
+	<a href="https://discuss.wetransform.to/#/forum"
+		target="_blank">Use the Support Forum</a>
+
+	<p>We offer a support forum where you can post questions and view discussions going on in the user community.</p><br>
+	</br>
+
+	<a href="https://www.wetransform.to/services/workshops/"
+ 	 target="_blank">Arrange an individual training (remote or on-premise)</a>
+
+	<p>Call us at +49 6151 6290890. Wetransform offers a wide range of trainings and workshops on various topics including INSPIRE, and advanced use of hale»studio.</p><br>
+	</br>
+
+	<a href="https://www.wetransform.to/services/support/"
+  	target="_blank">Get a professional support subscription</a>
+
+	 <p>A professional support contract can help you to achieve your goals more quickly. We provide complete end-to-end services, alleviating the need to struggle with complex requirements. In addition, we can provide you with the tools and training to do the work yourself. Please contact us at info@wetransform.to for more information.</p><br>
+	 </br>
+
+	</ul>
+</body>
+</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/define_custom_function.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/define_custom_function.html
index 683902af57..5568f9c214 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/define_custom_function.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/define_custom_function.html
@@ -6,9 +6,9 @@
 </head>
 <body>
 	<h1>Define a custom function</h1>
-	<p><i>hale studio</i> comes with a set of pre-defined transformation functions
+	<p><i>hale»studio</i> comes with a set of pre-defined transformation functions
 		that cover most basic mapping cases. If you need other functionality
-		the easiest way is to define a custom function directly in hale studio. In a
+		the easiest way is to define a custom function directly in hale»studio. In a
 		custom function you can use Groovy to determine the output, based on
 		input and parameters, similar to the Groovy script function. The main
 		difference to the Groovy script function is, that with a custom
@@ -93,7 +93,7 @@ <h3>Specify function behavior</h3>
 	</p>
 	
 	<h3>Function explanation</h3>
-	<p><i>hale studio</i> generates an explanation for mapping cells that reference specific
+	<p><i>hale»studio</i> generates an explanation for mapping cells that reference specific
 		transformation functions. As a last step you have the opportunity to
 		specify how this explanation is created for your custom function.</p>
 	<p>The explanation can be a fixed text, or it can be a template
@@ -104,12 +104,12 @@ <h3>Function explanation</h3>
 	</div>
 	<p>
 		To support both text and HTML explanations with a single template,
-		<i>hale studio</i> provides Markdown support using the <a
+		<i>hale»studio</i> provides Markdown support using the <a
 			href="https://github.com/sirthias/pegdown" target="_blank">pegdown</a>
 		Markdown processor.
 	</p>
 	<p>
-		To render the template <i>hale studio</i> uses the <a
+		To render the template <i>hale»studio</i> uses the <a
 			href="http://docs.groovy-lang.org/latest/html/documentation/template-engines.html#_gstringtemplateengine"
 			target="_blank">GStringTemplateEngine</a>. The variables available to
 		you in the template are the following:
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/edit.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/edit.png
index dc0e3b4097..e946dd4de1 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/edit.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/edit.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/entity_selection.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/entity_selection.png
index 5c2267836d..680c9cc9f1 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/entity_selection.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/entity_selection.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_create.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_create.png
index a1c37fceb8..9fca357259 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_create.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_create.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_select.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_select.png
index 9cc3668b6d..4c0a7ecc02 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_select.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/function_select.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/remove.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/remove.png
index a32ec88532..81ffa7eaa1 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/remove.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/images/remove.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/mapping_schema_elem.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/mapping_schema_elem.html
index 3fd11a7332..0a37447396 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/mapping_schema_elem.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/mapping_schema_elem.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Mapping schema elements</h1>
 	<p>
-		The main purpose of <i>hale studio</i> is of course not to just inspect
+		The main purpose of <i>hale»studio</i> is of course not to just inspect
 		schemas, but to map the elements of these schemas with the goal of
 		transforming corresponding (geo)data sets.
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/type_relations.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/type_relations.html
index dd21d089fd..78a70ca2cc 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/type_relations.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/alignment/type_relations.html
@@ -90,13 +90,13 @@ <h2>Conditional relations</h2>
 
 	<h2>Identify each type relation</h2>
 	<p>For the type correspondences as the next step you need to
-		identify how they can be expressed as relations in <i>hale</i>.</p>
+		identify how they can be expressed as relations in <i>hale»studio</i>.</p>
 	<p>
 		The most simple kind of relation is a 1:1 relation - a correspondence
 		between a single source and a single target type, where all
 		information needed to populate a target instance is present in a
 		single source instance - like in our <i>River/Watercourse</i> example.
-		This kind of relation is represented in <i>hale</i> by the <a
+		This kind of relation is represented in <i>hale»studio</i> by the <a
 			href="PLUGINS_ROOT/eu.esdihumboldt.cst.doc.functions/functions/eu.esdihumboldt.hale.align.retype.html">Retype</a>
 		function.<br />
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html
index 6aacbf0ec2..d1e59fe840 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/save_transformation.html
@@ -8,7 +8,7 @@
 	<h1>Save the transformation result</h1>
 	<p>
 		If you have defined a mapping and loaded source data in the
-		application, <i>hale studio</i> performs the transformation derived from the
+		application, <i>hale»studio</i> performs the transformation derived from the
 		mapping on the source data. This happens on every change to the
 		mapping, to instantly show the user what consequences his changes
 		have.
@@ -31,7 +31,7 @@ <h1>Save the transformation result</h1>
 		work based on a XML target schema.
 	</p>
 	<p>
-		Supported data export formats in <i>hale studio</i> are:
+		Supported data export formats in <i>hale»studio</i> are:
 	</p>
 	<ul>
 		<li><a href="../../reference/export/xml_data.html">XML</a></li>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/transform_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/transform_data.html
index d6a7f9eca6..0303a89715 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/transform_data.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/transform_data.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Transform external data</h1>
 	<p>To transform your data you don't need to load all of it into
-		hale studio. Usually it's a better practice to only load a representative
+		hale»studio. Usually it's a better practice to only load a representative
 		sample of your data, to help you verify the mapping and quickly get
 		feedback on its transformation. Once you have defined the mapping you
 		have the possibility to transform your data without loading it into
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/validate_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/validate_data.html
index 0cb7818f6f..9934012ead 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/validate_data.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/validate_data.html
@@ -10,11 +10,11 @@ <h1>Validate the transformed data</h1>
 		transformation result to not only follow the schema's structure, but
 		to also meet the other constraints defined by the schema, like
 		mandatory properties or restrictions on property values.</p>
-	<p>Validation of instances in <i>hale studio</i> currently is supported for XML
+	<p>Validation of instances in <i>hale»studio</i> currently is supported for XML
 		based schemas. Validation can be done on the exported transformation
 		result or on the transformed instances currently available in the
 		application.</p>
-	<p>In addition to schema-based checks, <i>hale studio</i> supports validation of the
+	<p>In addition to schema-based checks, <i>hale»studio</i> supports validation of the
 		exported transformation result with Schematron. To perform Schematron
 		validation, you can add the Schematron validator to the list of
 		validators and configure it when exporting the transformed instances.
@@ -35,7 +35,7 @@ <h2>Validation of exported data</h2>
 		produces a report about errors found during the validation and
 		informs you whether the file is valid or not.</p>
 
-	<h2>Validation inside hale studio</h2>
+	<h2>Validation inside hale»studio</h2>
 	<p>If a mapping exists and source data is loaded, each mapping change will
 		trigger the live transformation (if activated).
 		When the transformed data changes, schema-based validation is started
@@ -73,10 +73,10 @@ <h2>Validation inside hale studio</h2>
 	<div>
 		<img src="images/validation_properties.png">
 	</div>
-	<p>This kind of validation inside <i>hale studio</i> is very convenient, but may
+	<p>This kind of validation inside <i>hale»studio</i> is very convenient, but may
 		not be as accurate as the validation on export for some cases. This is
 		due to the fact that the export itself may change the result slightly
-		from what is available in hale studio. This could for instance be encodings
+		from what is available in hale»studio. This could for instance be encodings
 		that are only replied when writing certain properties, or values like
 		identifiers that are generated when missing.</p>
 
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/working_source_data.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/working_source_data.html
index 9022571b74..02c3f27765 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/working_source_data.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/data/working_source_data.html
@@ -8,12 +8,12 @@
 	<h1>Working with a source data set</h1>
 	<p>
 		The term <i>source data</i> refers to data according to the <i>source
-			schema</i> loaded in <i>hale studio</i>. Loading source data therefore always
+			schema</i> loaded in <i>hale»studio</i>. Loading source data therefore always
 		requires that the corresponding source schema has already been
 		imported.
 	</p>
 	<p>
-		Loading source data in <i>hale studio</i> serves to provide feedback on the
+		Loading source data in <i>hale»studio</i> serves to provide feedback on the
 		current mapping by transforming this data in the application. The <a
 			href="../../views/source_data.xhtml">Source Data view</a> can be used
 		to inspect the source data, while the <a
@@ -25,7 +25,7 @@ <h1>Working with a source data set</h1>
 	
 	<h2>Configuring a sample data set</h2>
 	<p>You have the possibility to load only a sub-set of your data in
-		hale studio, to use it as a sample for the data analysis and transformation
+		hale»studio, to use it as a sample for the data analysis and transformation
 		debugging. You can enable it in the tool bar or the project's source
 		data settings. To open the settings use tool bar button highlighted
 		below:</p>
@@ -61,7 +61,7 @@ <h3>Sample data and transformation</h3>
 		easily transform and export the complete data. Select <i>Transformation</i>&#8594;<i>Transform
 			project data...</i> from the menu to launch a wizard that will guide you
 		through the export configuration and launch the transformation. While
-		the transformation runs you can continue working in hale studio, as the
+		the transformation runs you can continue working in hale»studio, as the
 		transformation works on a copy of your current mapping.
 	</p>
 
@@ -79,7 +79,7 @@ <h2>Loading the data</h2>
 		choose the one that applies.
 	</p>
 	<p>
-		Supported data import formats in <i>hale studio</i> are:
+		Supported data import formats in <i>hale»studio</i> are:
 	</p>
 	<ul>
 		<li><a href="../../reference/import/xml_data.html">XML</a></li>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/account.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/account.html
index 694606e732..0fe809577e 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/account.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/account.html
@@ -2,12 +2,12 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Accessing your <i>hale connect</i> account</title>
+<title>Accessing your <i>hale»connect</i> account</title>
 </head>
 <body>
 	<h1>Login</h1>
 	<p>
-		From hale studio you can login to your <i>hale connect</i> account
+		From hale»studio you can login to your <i>hale»connect</i> account
 		either via the File menu or the Welcome page. 
 	</p>
 	<div>
@@ -19,7 +19,7 @@ <h1>Login</h1>
 		<i>Save credentials</i> checkbox. Your user name and password will 
 		be stored in a secure way. When you store your credentials for the 
 		first time, you will need to setup a master password for the secure 
-		storage to protect it against unauthorized use. <i>hale studio</i> 
+		storage to protect it against unauthorized use. <i>hale»studio</i> 
 		will query you for this password once every time the application is 
 		restarted as soon as the secure store is accessed for the first time.
 	</p>
@@ -29,11 +29,11 @@ <h1>Login</h1>
 	<h1>Preferences</h1>
 	<p>
 		You can edit the stored user name and password in the application
-		preferences dialog under <i>hale connect</i>. The credentials
+		preferences dialog under <i>hale»connect</i>. The credentials
 		are saved by clicking <i>Apply</i> or closing the preferences
 		dialog with <i>OK</i>. By clicking  <i>Validate credentials</i> 
 		you can check whether the entered credentials are accepted by 
-		<i>hale connect</i>. To remove stored credentials press
+		<i>hale»connect</i>. To remove stored credentials press
 		<i>Clear credentials</i> or choose <i>Log out and clear credentials</i>
 		from the <i>File</i> menu. 
 	</p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/images/hale_connect_welcome.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/images/hale_connect_welcome.png
index 6dcdf0267d..64ad36e4b7 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/images/hale_connect_welcome.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/images/hale_connect_welcome.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/loadproject.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/loadproject.html
index 073ffc6e56..5b4bba2cea 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/loadproject.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/loadproject.html
@@ -2,22 +2,22 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Accessing <i>hale connect</i> transformation projects</title>
+<title>Accessing <i>hale»connect</i> transformation projects</title>
 </head>
 <body>
-	<h1>Load a project from hale connect</h1>
+	<h1>Load a project from hale»connect</h1>
 	<p>
-		You can open <i>hale connect</i> transformation projects directly from
-		within <i>hale studio</i>. When you load a project from <i>hale connect</i>,
+		You can open <i>hale»connect</i> transformation projects directly from
+		within <i>hale»studio</i>. When you load a project from <i>hale»connect</i>,
 		you can also save any changes you make directly back there. When a 
-		project is loaded from <i>hale connect</i>, a <tt>[hale connect]</tt> label 
+		project is loaded from <i>hale»connect</i>, a <tt>[hale connect]</tt> label 
 		will be shown in the application title.
 	</p>  
 	<p>
-		To look for available projects online in <i>hale connect</i>, use the
+		To look for available projects online in <i>hale»connect</i>, use the
 		<i>File</i>&#8594;<i>Open Alignment Project</i> command and switch
-		to the <i>From hale connect</i> tab. In case you have not logged into
-		<i>hale connect</i> before, you can use the <i>Login</i> button on
+		to the <i>From hale»connect</i> tab. In case you have not logged into
+		<i>hale»connect</i> before, you can use the <i>Login</i> button on
 		the screen shown below to log in.
 	</p>
 	<div>
@@ -37,7 +37,7 @@ <h1>Load a project from hale connect</h1>
 	</div>
 	<p>
 		To continue, select the project you want to open from the list, and
-		press <i>Finish</i> twice to download the project into hale studio.
+		press <i>Finish</i> twice to download the project into hale»studio.
 	</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/shareproject.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/shareproject.html
index ceaa401f6a..14fb99699d 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/shareproject.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/haleconnect/shareproject.html
@@ -9,23 +9,23 @@
 	<h1>Publishing a project</h1>
 	<p>
 		There are two ways to publish a transformation project on
-		<i>hale connect</i>:
+		<i>hale»connect</i>:
 		<ul>
 			<li>
 				By <b>sharing</b> the project with the
 				<i>File</i>&#8594;<i>Share project...</i> command. This
 				will export a snapshot of your current project to
-				<i>hale connect</i>.
+				<i>hale»connect</i>.
 			</li>
 			<li>
-				By <b>saving</b> the project to <i>hale connect</i>
+				By <b>saving</b> the project to <i>hale»connect</i>
 				just like you would save to a local project file
 				using <i>File</i>&#8594;<i>Save Alignment project as...</i>.
 			</li>
 		</ul>
 
 		In both cases you will be presented with the same wizard to complete
-		project details before the upload to <i>hale connect</i>.
+		project details before the upload to <i>hale»connect</i>.
 	</p>
 	<p>
 		On the first screen of the wizard you are asked to provide the project
@@ -33,21 +33,21 @@ <h1>Publishing a project</h1>
 	</p>
 	<p>
 		On the next page you are requested to provide the export destination.
-		In case you have not logged into <i>hale connect</i> before, you can
+		In case you have not logged into <i>hale»connect</i> before, you can
 		use the <i>Login</i> button on the screen shown below to log in.
 	</p>
 	<div>
 		<img src="images/hale_connect_share_new.png" class="fit">
 	</div>
 	<p>
-		You can choose to either create a new project on <i>hale connect</i>
+		You can choose to either create a new project on <i>hale»connect</i>
 		or update an existing one. In case the currently opened project
-		was loaded from <i>hale connect</i>, updating the loaded project
+		was loaded from <i>hale»connect</i>, updating the loaded project
 		will be selected by default.
 	</p>
 	<p>
 		You must also choose whether you will be the owner of the uploaded
-		project on <i>hale connect</i> or one of your organizations. You must
+		project on <i>hale»connect</i> or one of your organizations. You must
 		select which of the organisations that you belong will own the uploaded
 		project via the dropdown. Note that only the first option is available
 		in cases where you are not allowed to add projects in the name of any of
@@ -61,11 +61,11 @@ <h3>Options</h3>
 		</tr>
 		<tr>
 			<td><i>Enable versioning?</i></td>
-			<td>Enables versioning of the <i>hale connect</i> transformation project.</td>
+			<td>Enables versioning of the <i>hale»connect</i> transformation project.</td>
 		</tr>
 		<tr>
 			<td><i>Allow public access?</i></td>
-			<td>If selected, the created or updated project will be publicly available on <i>hale connect</i>.</td>
+			<td>If selected, the created or updated project will be publicly available on <i>hale»connect</i>.</td>
 		</tr>
 		<tr>
 			<td><i>Include web resources?</i></td>
@@ -74,7 +74,7 @@ <h3>Options</h3>
 		<tr>
 			<td><i>Exclude source data?</i></td>
 			<td>
-				If selected, no source data will be uploaded to <i>hale connect</i>. This option is
+				If selected, no source data will be uploaded to <i>hale»connect</i>. This option is
 				enabled by default to prevent the inadvertent upload of large datasets.
 			</td>
 		</tr>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/save_project.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/save_project.html
index e0d6fc61a2..a36aafc887 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/save_project.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/save_project.html
@@ -7,7 +7,7 @@
 <body>
 	<h1>Saving your work</h1>
 	<p>
-		<i>hale studio</i> allows you to save your mapping, together with the
+		<i>hale»studio</i> allows you to save your mapping, together with the
 		configuration which schemas and source data sets are used in an
 		alignment project. The project also includes additional settings, e.g.
 		the list of mapping relevant types and the map styles. You can
@@ -40,7 +40,7 @@ <h1>Saving your work</h1>
 		</li>
 		<li>With a <b>hale connect transformation project</b> you can upload
 			your project including the alignment and all local resources to
-			the collaboration platform <a href="https://www.haleconnect.com">hale connect</a>.
+			the collaboration platform <a href="https://www.haleconnect.com">hale»connect</a>.
 		</li>
 	</ul>
 </body>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/inspire_schema.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/inspire_schema.html
index 253f943e94..31c9755ac9 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/inspire_schema.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/inspire_schema.html
@@ -12,13 +12,13 @@ <h1>Using INSPIRE GML data models</h1>
 		exchange formats for INSPIRE. One application of those exchange
 		formats is the provision of data through INSPIRE Download services.</p>
 	<p>
-		To use an INSPIRE GML data model in <i>hale studio</i> all you have to do is
+		To use an INSPIRE GML data model in <i>hale»studio</i> all you have to do is
 		loading the corresponding GML Application Schema as source or target
 		schema (see <a
 			href="PLUGINS_ROOT/eu.esdihumboldt.hale.doc.user/html/tasks/schema/load_browse_schema.html">Loading
 			and browsing schemas</a>).<br> The GML Application Schemas are
 		provided by the European Commission. You can either use the schema
-		presets defined in <i>hale studio</i> (choose &quot;From preset&quot; when importing
+		presets defined in <i>hale»studio</i> (choose &quot;From preset&quot; when importing
 		a schema) or the <a href="http://inspire.ec.europa.eu/schemas/"
 			target="_blank">schema repository</a> maintained by the JRC.
 	</p>
@@ -27,7 +27,7 @@ <h1>Using INSPIRE GML data models</h1>
 			href="https://inspire.ec.europa.eu/data-specifications/2892"
 			target="_blank">https://inspire.ec.europa.eu/data-specifications/2892</a>
 	</p>
-	<p><i>hale studio</i> provides some pre-defined schema locations you can choose
+	<p><i>hale»studio</i> provides some pre-defined schema locations you can choose
 		from - currently the INSPIRE schemas for Annex I, II and III in
 		versions 3.0 and 4.0 are listed:</p>
 	<div>
@@ -44,7 +44,7 @@ <h1>Using INSPIRE GML data models</h1>
 			target="_blank">http://inspire.ec.europa.eu/draft-schemas/</a> (Draft
 		schemas)<br> <br> The schemas available there are not meant
 		for download - instead their URLs should be used to load them into
-		<i>hale studio</i> (e.g. by browsing the repository and using &quot;Copy Link
+		<i>hale»studio</i> (e.g. by browsing the repository and using &quot;Copy Link
 		Location&quot; for a schema file to copy its URL to the clipboard and
 		further providing it in &quot;From URL&quot; when importing a schema).
 	</p>
@@ -53,7 +53,7 @@ <h2>Code lists</h2>
 		The INSPIRE data models make heavy use of code lists. A lot of these
 		code lists are provided through the <a
 			href="http://inspire.ec.europa.eu/codelist/" target="_blank">INSPIRE
-			code list register</a>. With <i>hale studio</i> you can easily load them to use them
+			code list register</a>. With <i>hale»studio</i> you can easily load them to use them
 		for a convenient selection from the available values. In the code list
 		import, select &quot;From INSPIRE registry&quot; to download the
 		current list of code lists and select a code list to load into the
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/load_browse_schema.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/load_browse_schema.html
index 8f1729bb5e..4c375b19a2 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/load_browse_schema.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/schema/load_browse_schema.html
@@ -10,7 +10,7 @@ <h1>Loading and browsing schemas</h1>
 		start with the creation of a mapping you have to determine what the
 		source and target schemas are.</p>
 	<p>
-		Loading a schema in <i>hale studio</i> provides you with the possibility to
+		Loading a schema in <i>hale»studio</i> provides you with the possibility to
 		browse the schema in the <a href="../../views/schema_explorer.html">Schema
 			Explorer</a> and to get detailed information on the defined types and
 		their properties.
@@ -50,7 +50,7 @@ <h2>Target schema</h2>
 
 	<h2>Supported schema formats</h2>
 	<p>
-		<i>hale studio</i> supports the following formats for schema import:
+		<i>hale»studio</i> supports the following formats for schema import:
 	</p>
 	<ul>
 		<li><a href="../../reference/import/xml_schema.html">XML
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/transform_cli.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/transform_cli.html
index 0b43a3fa83..0e7d5abd18 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/transform_cli.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/tasks/transform_cli.html
@@ -7,9 +7,9 @@
 <body>
 	<h1>Transformation via the command line</h1>
 	<p>This help topic is about performing transformation of source
-		data using the command line interface provided by <i>hale studio</i>. It allows you
-		to execute transformations based on mappings defined in <i>hale studio</i>, without
-		having to use <i>hale studio</i> as desktop application, for instance to run the
+		data using the command line interface provided by <i>hale»studio</i>. It allows you
+		to execute transformations based on mappings defined in <i>hale»studio</i>, without
+		having to use <i>hale»studio</i> as desktop application, for instance to run the
 		transformation automatically on a regular basis or to integrate it
 		with existing infrastructure.</p>
 	<p>The following are the basic things you need to use the command
@@ -21,33 +21,33 @@ <h1>Transformation via the command line</h1>
 	</ol>
 
 	<h2>General usage</h2>
-	<p>You can run <i>hale studio</i> on the command line either using the <i>hale studio</i>
+	<p>You can run <i>hale»studio</i> on the command line either using the <i>hale»studio</i>
 		executable (i.e. HALE.exe) or using Java directly. Depending on the
 		operating system, behavior may be different, but in general it is
 		better to use Java directly (either use locally installed compatible
-		version of Java or the version shipped with <i>hale studio</i>), especially if you
+		version of Java or the version shipped with <i>hale»studio</i>), especially if you
 		include the task in an automated process. The advantage of using the
-		<i>hale studio</i> executable is that it uses the Java version that is shipped with
-		<i>hale studio</i> automatically and sets some important system properties for you.
+		<i>hale»studio</i> executable is that it uses the Java version that is shipped with
+		<i>hale»studio</i> automatically and sets some important system properties for you.
 		The following are the commands to show the usage information of the
 		command line interface, with the executable or via Java, assuming your
-		working directory is the <i>hale studio</i> installation folder:</p>
-	<p>Running the <i>hale studio</i> executable:</p>
+		working directory is the <i>hale»studio</i> installation folder:</p>
+	<p>Running the <i>hale»studio</i> executable:</p>
 	<pre class="cli"><code><b>&gt;</b> <i>HALE -nosplash</i> -application hale.transform</code></pre>
 	<p>Running Java:</p>
 	<pre class="cli"><code><b>&gt;</b> <i>java -Xmx1024m -Dcache.level1.enabled=false -Dcache.level1.size=0 -Dcache.level2.enabled=false -Dcache.level2.size=0 -jar plugins\org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar</i> -application hale.transform</code></pre>
 	<p>Running the command above will show the usage information of the
 		transformation application. Please note that for the Java call, the
-		version of the launcher JAR file may change with new <i>hale studio</i> versions and
+		version of the launcher JAR file may change with new <i>hale»studio</i> versions and
 		you should use a path delimiter appropriate for your system.</p>
 	<p>Additionally, the Java call specifies settings and system
 		properties for the Java VM. You cannot provide these settings to a
-		call to the <i>hale studio</i> executable - in that case you have to adapt the file
+		call to the <i>hale»studio</i> executable - in that case you have to adapt the file
 		<code>HALE.ini</code>. Following is a short description of the most important
 		VM arguments:</p>
 	<ul>
 		<li style="padding-bottom: 16px;"><code>-Xmx1024m</code><br><br>This setting specifies the
-			<b>maximum heap memory</b> provided as working memory for <i>hale studio</i>. If you are
+			<b>maximum heap memory</b> provided as working memory for <i>hale»studio</i>. If you are
 			with very large individual instances you may need to increase the
 			value. The example specifies a maximum heap space of 1024 MB.</li>
 		<li style="padding-bottom: 16px;"><code>-Dcache.level1.enabled=false
@@ -57,17 +57,17 @@ <h2>General usage</h2>
 			run into memory issues.</li>
 		<li style="padding-bottom: 16px;"><code>-Dlog.hale.level=INFO -Dlog.root.level=WARN</code><br><br>These
 			settings allow you to <b>configure the log level</b> for log events emitted
-			by <i>hale studio</i>. These log events may overlap with messages from the reports,
+			by <i>hale»studio</i>. These log events may overlap with messages from the reports,
 			but are generally independent. <code>log.hale.level</code> controls
-			the log level for components of <i>hale studio</i>, while <code>log.root.level</code>
+			the log level for components of <i>hale»studio</i>, while <code>log.root.level</code>
 			controls the log level for other code, such as third party libraries.
 			See the <a href="http://logback.qos.ch/manual/configuration.html"
 			target="_blank">logback documentation</a> for more information on
 			logging levels and other details about the logging configuration.</li>
-		<li style="padding-bottom: 16px;">If you need <i>hale studio</i> to <b>connect to the internet via a
+		<li style="padding-bottom: 16px;">If you need <i>hale»studio</i> to <b>connect to the internet via a
 				proxy server</b>, you need to provide that information as system
 			properties as well. The command line interface will not read the
-			proxy settings you configured in the <i>hale studio</i> user interface.<br><br>
+			proxy settings you configured in the <i>hale»studio</i> user interface.<br><br>
 			The following system properties can be provided to configure the proxy:
 			<ul>
 				<li><code>http.proxyHost</code> - the proxy host name or IP address</li>
@@ -96,7 +96,7 @@ <h2>General usage</h2>
 		is an <b>application argument</b>.
 	</p>
 	<p class="Note">
-		<b>Note:</b> As an alternative to using the <i>hale studio</i> application to
+		<b>Note:</b> As an alternative to using the <i>hale»studio</i> application to
 		launch the CLI, you can use the dedicated <a
 			href="https://github.com/halestudio/hale-cli" target="_blank">hale-cli</a>.
 		With <i>hale-cli</i> a transformation is called like this:<br>
@@ -106,13 +106,13 @@ <h2>General usage</h2>
 	</p>
 	<p class="Note">
 		<b>Note:</b>
-		If using the <i>hale studio</i> executable on Windows you will probably want to add the <code>-console</code> launcher argument as well:
+		If using the <i>hale»studio</i> executable on Windows you will probably want to add the <code>-console</code> launcher argument as well:
 		<code>HALE -nosplash -console -application hale.transform</code><br>
 		Otherwise you may get no feedback from the application (if you still get no feedback, launch via Java).
 	</p>
 	<p class="Note">
-		<b>Note:</b> If using a version of <i>hale studio</i> installed with the Windows
-		installer (or generally a version of <i>hale studio</i> that has no write access to
+		<b>Note:</b> If using a version of <i>hale»studio</i> installed with the Windows
+		installer (or generally a version of <i>hale»studio</i> that has no write access to
 		its directory) it is needed to specify a data location with the
 		additional launcher argument
 		<code>-data</code>
@@ -202,7 +202,7 @@ <h4>Source data</h4>
 		<code>-source</code>
 		argument for each.
 	</p>
-	<p><i>hale studio</i> will try to guess the file format and how to read it, so in
+	<p><i>hale»studio</i> will try to guess the file format and how to read it, so in
 		most cases it will be enough to specify the location of the source
 		data. But you also have the possibility to control in detail which
 		hale data reader to use and how to configure it.</p>
@@ -213,7 +213,7 @@ <h4>Source data</h4>
 		kind of configuration options they offer.
 	</p>
 	<h4>Filtering source data</h4>
-	<p>By default <i>hale studio</i> uses all data passed in as sources for the
+	<p>By default <i>hale»studio</i> uses all data passed in as sources for the
 		transformation. The filter options allow you to filter the source data
 		before it is passed to the transformation. This can be helpful for
 		selecting only objects actually needed for the transformation (e.g. to
@@ -284,9 +284,9 @@ <h4>Transformation result</h4>
 	</p>
 	<p>
 		The recommended approach is to use an export preset. You can easily
-		define it in <i>hale studio</i> with support through the UI, and save it as part of
+		define it in <i>hale»studio</i> with support through the UI, and save it as part of
 		the project. An export preset essentially stores the configuration
-		information on how to save the data. Create it in <i>hale studio</i> via <i>File</i>&#8594;<i>Export</i>&#8594;<i>Create
+		information on how to save the data. Create it in <i>hale»studio</i> via <i>File</i>&#8594;<i>Export</i>&#8594;<i>Create
 			custom data export...</i> in the main menu. Configure the export and
 		specify a name for the preset - this name is what you specify to use
 		the preset on the command line.
@@ -327,7 +327,7 @@ <h4>Other options</h4>
 			the validation. Use this option if you want to know in detail what
 			kind of warnings or errors may have occurred during the execution of
 			these tasks. If you find the file format hard to read, import the
-			report log into the <i>Report List</i> view in <i>hale studio</i>.
+			report log into the <i>Report List</i> view in <i>hale»studio</i>.
 		</dd>
 		<dt><code>-stacktrace</code></dt>
 		<dd>Provide this flag to enable printing the stacktrace if
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/alignment.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/alignment.html
index 29c6901d62..853aac9215 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/alignment.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/alignment.html
@@ -25,7 +25,7 @@ <h1>Alignment view</h1>
 		mapping of the example project provided in the <a class="command-link"
 			href='javascript:executeCommand("org.eclipse.ui.cheatsheets.openCheatSheet(cheatSheetId=eu.esdihumboldt.hale.ui.firststeps.firststepsCS)")'>
 			<img src="PLUGINS_ROOT/org.eclipse.help/command_link.png"
-			alt="command link">Get started with hale studio</a>
+			alt="command link">Get started with hale»studio</a>
 		guide. The mapping cells displayed are those that are associated with
 		the selected relation. This is always the corresponding cell, defining
 		the type relation, but also the mappings on properties that are
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/images/functions_view.png b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/images/functions_view.png
index 70ab9d2472..c41972d915 100644
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/images/functions_view.png and b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/images/functions_view.png differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/properties.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/properties.html
index df01773a21..ca1d57eb29 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/properties.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/properties.html
@@ -10,7 +10,7 @@ <h1>Properties view</h1>
 		The properties view displays detailed information about the currently
 		selected object. Depending on the type of object, a different set of
 		properties is displayed. The object types for which this information
-		is available in <i>hale studio</i> are the following:
+		is available in <i>hale»studio</i> are the following:
 	</p>
 	<ul>
 		<li>Schema elements (e.g. selection from the <a
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/schema_explorer.html b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/schema_explorer.html
index 8cf1eace3b..dcc93d6b99 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/schema_explorer.html
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/html/views/schema_explorer.html
@@ -19,7 +19,7 @@ <h1>Schema Explorer</h1>
 	<p>
 		The top level elements in the schema explorer are the classes/types
 		defined in the schema, which may be used in the mapping. When loading
-		a schema <i>hale studio</i> tries to determine this automatically, but you
+		a schema <i>hale»studio</i> tries to determine this automatically, but you
 		can also define manually, which types are relevant for your mapping.
 	</p>
 	<p>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.user/toc.xml b/doc/plugins/eu.esdihumboldt.hale.doc.user/toc.xml
index 84de97461a..fdd61eabc1 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.user/toc.xml
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.user/toc.xml
@@ -9,9 +9,16 @@
       </topic>
       <anchor id="introduction"/>
    </topic>
+   <topic label="Resources">
+      <topic href="html/resources/resources_HALE.html" label="Resources and Support">
+      </topic>
+      <anchor id="resources"/>
+   </topic>
    <topic label="What&apos;s new?">
-     <topic href="html/new/4_0_0.xhtml" label="New in 4.0">
-     </topic>
+      <topic href="html/new/4_1_0.xhtml" label="New in 4.1">
+      </topic>
+      <topic href="html/new/4_0_0.xhtml" label="New in 4.0">
+      </topic>
       <topic href="html/new/3_5_0.xhtml" label="New in 3.5">
       </topic>
       <topic href="html/new/3_4_0.xhtml" label="New in 3.4">
@@ -189,6 +196,10 @@
             </topic>
             <topic href="html/reference/import/xls.html" label="XLS">
             </topic>
+            <topic href="html/reference/import/geopackage.html" label="GeoPackage">
+            </topic>
+            <topic href="html/reference/import/xplan_data.html" label="XPlanGML">
+            </topic>
             <anchor id="import"/>
          </topic>
          <topic label="Export">
@@ -211,6 +222,10 @@
             </topic>
             <topic href="html/reference/export/xls_data.html" label="XLS">
             </topic>
+            <topic href="html/reference/export/geopackage.html" label="GeoPackage">
+            </topic>
+            <topic href="html/reference/export/xplan_data.html" label="XPlanGML">
+            </topic>
             <topic href="html/reference/export/html_mapping.html" label="HTML mapping documentation">
                <topic href="html/reference/export/sample_documentation.html" label="Example">
                </topic>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.util/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.util/META-INF/MANIFEST.MF
index 9cbbacc76b..bb75441326 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.util/META-INF/MANIFEST.MF
+++ b/doc/plugins/eu.esdihumboldt.hale.doc.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.util
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.help;bundle-version="3.5.100"
 Import-Package: com.google.common.base;version="9.0.0",
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/META-INF/MANIFEST.MF b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/META-INF/MANIFEST.MF
deleted file mode 100644
index ba02bde396..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: HALE XtraServer plug-in User Guide
-Bundle-SymbolicName: eu.esdihumboldt.hale.doc.xtraserver;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-Vendor: data harmonisation panel
-Require-Bundle: org.eclipse.help
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/build.properties b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/build.properties
deleted file mode 100644
index 12f1c78512..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               html/,\
-               plugin.xml,\
-               images/,\
-               toc.xml
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/contact.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/contact.html
deleted file mode 100644
index b9091e7949..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/contact.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>XtraServer Plug-in for <i>hale studio</i> - Point of Contact</title>
-</head>
-<body>
-	<h1>Point of Contact</h1> 
-
-	<img src="../images/logo_ii.jpg" style="max-width: 250px;">
-	<p>
-	<strong>Address</strong>: Trierer Strasse 70-72, 53115 Bonn - Germany<br>
-	<strong>Phone</strong>: 0049 228 91410 70<br>
-	<strong>Email</strong>: xtraserver@interactive-instruments.de<br>
-	</p>
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/introduction/intro.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/introduction/intro.html
deleted file mode 100644
index f75026742c..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/introduction/intro.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>Introduction to the XtraServer plugin for <i>hale studio</i></title>
-</head>
-<body>
-	<h1>XtraServer plugin for <i>hale studio</i></h1>
-
-	<p>
-	XtraServer is a product of interactive instruments. It is a suite of implementations of various OGC service specifications, e.g. Web Feature Service (WFS) and Web Map Service (WMS).
-	</p>
-	<p>
-	XtraServer services can base on any application schema according to the Geography Markup Language (GML). For this, a mapping from the GML application schema to the table structure of the underlying database is to be provided in the configuration of the service.
-	</p>
-	<p>
-	The mapping language of XtraServer is very flexible and can virtually map all GML application schemas to heavily deviating database schemas. For this reason, mappings can be quite complex.
-	</p>
-	
-	<p>
-	The purpose of this plugin is to
-	<ul>
-		<li>transform the XtraServer mappings to hale alignments (via Import) and</li>
-		<li>generate new XtraServer mapping file easily (via Export)</li>
-	</ul>
-	</p>
-	
-	<h2>Installation requirements</h2>
-	
-	The plug-in is already bundled in the standard hale studio distribution, starting from version 3.4.0. 
-
-</p>
-
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/basic_workflow.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/basic_workflow.html
deleted file mode 100644
index c4228d7bd2..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/basic_workflow.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>XtraServer Plug-in for <i>hale studio</i> - Basic workflow</title>
-</head>
-<body>
-	<h1>Basic workflow</h1>
-	<p>
-	<ol>
-	<li>Create a new hale project and import source and target schemas, as usual. Currently, for the source schema you are limited to schemas imported from a PostgreSQL database. For the target schema, a GML 3.2 application schema should be used.</li>
-	<li>Turn on the XtraServer compatibility mode, to be notified when an incompatibility that makes the alignment not automatically translatable to an XtraServer mapping is detected.</li>
-	<li>Import an XtraServer mapping file that matches the given source and target schemas to generate the new alignment.</li>
-	<li>Optionally make changes to the alignment.</li>
-	<li>Export the alignment as an XtraServer mapping file or archive.</li>
-	</ol>
-	</p>
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/compatibility_mode.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/compatibility_mode.html
deleted file mode 100644
index 5d204b96a2..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/compatibility_mode.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>XtraServer Plug-in for <i>hale studio</i> - XtraServer compatibility mode</title>
-</head>
-<body>
-	<h1>XtraServer compatibility mode</h1>
-	<p>
-	To help the user discern which functions are compatible with an XtraServer mapping and which are not, an XtraServer compatibility mode has been added to hale studio.
-	</p>
-	<p>
-	Once the mode is activated, the mapping function selection menu in the schema explorer view will only list the functions which are compatible with the XtraServer mapping, and a red cross will appear at the bottom right corner of the window if the alignment cannot be automatically translated to XtraServer mapping.
-	</p>
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/export.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/export.html
deleted file mode 100644
index 0591bc9794..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/export.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>XtraServer Plug-in for <i>hale studio</i> - Export XtraServer mapping</title>
-</head>
-<body>
-	<h1>Export XtraServer mapping</h1>
-
-	<p>
-	Open the export dialog (File -> Import -> Alignment -> XtraServer Mapping).
-	</p>
-	
-	<div style="padding: 10px; text-align: center;"><img src="../../images/export_alignment.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	Choose the export format XtraServer Mapping in the next step.
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/export_format.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	There are two different options for the export. You can choose them via the file type field.
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/export_type.jpg" style="width: 100%; max-width: 512px"></div>
-
-	<ul>
-	<li>XtraServer Mapping File (*.xml): only the mapping file is generated.</li>
-	<li>XtraServer Mapping Archive (*.zip): the export will generate a ZIP archive containing all the required files </li>
-	<ul><li>XtraSrvConfig_Mapping.inc.xml</li>
-	<li>XtraSrvConfig_Geoindexes.inc.xml</li>
-	<li>XtraSrvConfig_FeatureTypes.inc.xml</li>
-	<li>XtraSrvConfig_GetSpatialDataSetSQ.inc.xml</li>
-	<li>XtraSrvConfig_StoredQueriesToCache.inc.xml</li></ul>
-	</ul>
-	</p>
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/import.html b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/import.html
deleted file mode 100644
index 51945de734..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/html/usage/import.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<script type="text/javascript"
-	src="PLUGINS_ROOT/org.eclipse.help/livehelp.js">
-</script>
-<title>XtraServer Plug-in for <i>hale studio</i> - Import XtraServer mapping</title>
-</head>
-<body>
-	<h1>Import XtraServer mapping</h1>
-
-	<p>
-	Via the XtraServer plugin it is possible to transform an XtraServer mapping into a hale alignment.
-	</p>
-	
-	<p>
-	The first step is to import a database schema as source schema. Open the import dialog for source schema (File -> Import -> Source schema).
-	</p>
-	
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_source.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	Select the database panel and configure the database connection
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_source_db.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	and user settings.
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_source_db_user.jpg" style="width: 100%; max-width: 512px"></div>
-
-	<p>
-	Then import the target schema (File -> Import -> Target schema). 
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_target_file.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	Notice: activate the checkbox for Mappable types.
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_target_mappable-types.jpg" style="width: 100%; max-width: 512px"></div>
-	
-	<p>
-	In the last step import the alignment from file, e.g. XtraSrvConfig_Mapping.inc.xml (File -> Import -> Alignment). Based on this mapping a hale alignment will be created.
-	</p>
-
-	<div style="padding: 10px; text-align: center;"><img src="../../images/import_alignment.jpg" style="width: 100%; max-width: 512px"></div>
-	
-</body>
-</html>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_alignment.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_alignment.jpg
deleted file mode 100644
index ac8680fefd..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_alignment.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_format.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_format.jpg
deleted file mode 100644
index 5e7ac13168..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_format.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_type.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_type.jpg
deleted file mode 100644
index 1435a3de70..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/export_type.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_alignment.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_alignment.jpg
deleted file mode 100644
index a97a96e4ed..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_alignment.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source.jpg
deleted file mode 100644
index 640a4ce04b..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db.jpg
deleted file mode 100644
index 8fbad92c74..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_schema.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_schema.jpg
deleted file mode 100644
index 1d4aa455cc..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_schema.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_user.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_user.jpg
deleted file mode 100644
index 646207f683..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_source_db_user.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target.jpg
deleted file mode 100644
index 640a4ce04b..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_file.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_file.jpg
deleted file mode 100644
index 3080ff5e2d..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_file.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_mappable-types.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_mappable-types.jpg
deleted file mode 100644
index 5f794b79ae..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/import_target_mappable-types.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/logo_ii.jpg b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/logo_ii.jpg
deleted file mode 100644
index 768c550e0c..0000000000
Binary files a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/images/logo_ii.jpg and /dev/null differ
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/plugin.xml b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/plugin.xml
deleted file mode 100644
index 81b871ea33..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/toc.xml b/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/toc.xml
deleted file mode 100644
index ed50f9b49b..0000000000
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/toc.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<toc label="XtraServer Plug-in for hale">
-   <topic href="html/introduction/intro.html" label="Introduction">
-      <anchor id="introduction"/>
-   </topic>
-   <topic href="html/usage/basic_workflow.html" label="Usage">
-      <topic href="html/usage/compatibility_mode.html" label="XtraServer compatibility mode">
-      </topic>
-      <topic href="html/usage/import.html" label="Import an XtraServer Mapping">
-      </topic>
-      <topic href="html/usage/export.html" label="Export an XtraServer Mapping">
-      </topic>
-      <anchor id="usage"/>
-   </topic>
-   <topic href="html/contact.html" label="Point of contact">
-   </topic>
-</toc>
diff --git a/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF b/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF
index 1a6ad7b632..31a9fb0bae 100644
--- a/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF
+++ b/ext/adv/eu.esdihumboldt.hale.adv.merge.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AdV Alignment Merge functions tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.adv.merge.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.adv.merge;bundle-version="3.3.2",
  eu.esdihumboldt.hale.common.align.merge;bundle-version="3.3.2",
diff --git a/ext/adv/eu.esdihumboldt.hale.adv.merge/META-INF/MANIFEST.MF b/ext/adv/eu.esdihumboldt.hale.adv.merge/META-INF/MANIFEST.MF
index 29610c159f..fcc085f964 100644
--- a/ext/adv/eu.esdihumboldt.hale.adv.merge/META-INF/MANIFEST.MF
+++ b/ext/adv/eu.esdihumboldt.hale.adv.merge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AdV Alignment Merge functions
 Bundle-SymbolicName: eu.esdihumboldt.hale.adv.merge;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align.merge;bundle-version="3.3.2",
diff --git a/ext/ageobw/eu.esdihumboldt.hale.app.bgis.ade/src/eu/esdihumboldt/hale/app/bgis/ade/defaults/GenerateDefaults.java b/ext/ageobw/eu.esdihumboldt.hale.app.bgis.ade/src/eu/esdihumboldt/hale/app/bgis/ade/defaults/GenerateDefaults.java
index 06913c9cec..8abb8f56ba 100644
--- a/ext/ageobw/eu.esdihumboldt.hale.app.bgis.ade/src/eu/esdihumboldt/hale/app/bgis/ade/defaults/GenerateDefaults.java
+++ b/ext/ageobw/eu.esdihumboldt.hale.app.bgis.ade/src/eu/esdihumboldt/hale/app/bgis/ade/defaults/GenerateDefaults.java
@@ -44,7 +44,7 @@
 import eu.esdihumboldt.hale.common.schema.io.SchemaReader;
 import eu.esdihumboldt.hale.common.schema.model.Schema;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace;
+import eu.esdihumboldt.hale.common.schema.model.impl.ResourceSchemaSpace;
 
 /**
  * Generates default value mappings for BGIS CityGML ADE.
@@ -55,6 +55,8 @@ public class GenerateDefaults implements BGISAppConstants {
 
 	private Schema schema;
 
+	private String resourceId;
+
 	private Alignment alignment;
 
 	private DefaultValues defaultValues;
@@ -96,6 +98,7 @@ private void loadSchema() throws IOProviderConfigurationException, IOException {
 			throw new IllegalStateException("Failed to load schema");
 		}
 		schema = schemaReader.getSchema();
+		resourceId = schemaReader.getResourceIdentifier();
 	}
 
 	private void loadConfig() {
@@ -154,7 +157,8 @@ private void writeAlignment() throws Exception {
 		AlignmentWriter writer = (AlignmentWriter) factory.createExtensionObject();
 
 		// configure alignment writer
-		writer.setTargetSchema(new DefaultSchemaSpace().addSchema(schema));
+		writer.setTargetSchema(
+				new ResourceSchemaSpace().addSchema(resourceId, schema));
 		writer.setTarget(new FileIOSupplier(context.getOut()));
 		writer.setAlignment(alignment);
 
diff --git a/ext/fme/de.fhg.igd.hale.fme.branding/META-INF/MANIFEST.MF b/ext/fme/de.fhg.igd.hale.fme.branding/META-INF/MANIFEST.MF
index 79531732b2..c5a27c0d08 100644
--- a/ext/fme/de.fhg.igd.hale.fme.branding/META-INF/MANIFEST.MF
+++ b/ext/fme/de.fhg.igd.hale.fme.branding/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE FME Plug-In Connector
 Bundle-SymbolicName: de.fhg.igd.hale.fme.branding
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
diff --git a/ext/fme/de.fhg.igd.hale.fme.feature/feature.xml b/ext/fme/de.fhg.igd.hale.fme.feature/feature.xml
index fd5df28986..d9b5afb314 100644
--- a/ext/fme/de.fhg.igd.hale.fme.feature/feature.xml
+++ b/ext/fme/de.fhg.igd.hale.fme.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.fhg.igd.hale.fme.feature"
       label="HALE FME Plug-In Connector Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="Fraunhofer IGD"
       plugin="de.fhg.igd.hale.fme.branding">
 
diff --git a/ext/geom/de.fhg.igd.geom/META-INF/MANIFEST.MF b/ext/geom/de.fhg.igd.geom/META-INF/MANIFEST.MF
index 3cd4adec39..2ef03c2826 100644
--- a/ext/geom/de.fhg.igd.geom/META-INF/MANIFEST.MF
+++ b/ext/geom/de.fhg.igd.geom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geometry
 Bundle-SymbolicName: de.fhg.igd.geom;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.fhg.igd.geom,
diff --git a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF
index 6b266265c7..140a77ec23 100644
--- a/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF
+++ b/ext/nonosgi/eu.esdihumboldt.hale.util.nonosgi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Utilities for usage in Non-OSGi environment
 Bundle-SymbolicName: eu.esdihumboldt.hale.util.nonosgi
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0"
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml b/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml
index ec2ee9b70f..fdc89f77c0 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml
+++ b/ext/styledmap/de.fhg.igd.mapviewer.feature.all/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.fhg.igd.mapviewer.feature.all"
       label="All Mapviewer bundles"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       GNU Lesser General Public License, license of included dependencies may vary (see the individual plug-ins).
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml b/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml
index 7d8026478e..7b56dac1f5 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml
+++ b/ext/styledmap/de.fhg.igd.mapviewer.feature.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="de.fhg.igd.mapviewer.feature.core"
       label="Mapviewer Core"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       GNU Lesser General Public License, license of included dependencies may vary (see the individual plug-ins).
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF
index 1c85890194..d8da9c16b8 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.server.file/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Map File
 Bundle-SymbolicName: de.fhg.igd.mapviewer.server.file;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.ui.util.extension,
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF
index 14917847dc..ae2c71750d 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.server.openstreetmap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpenStreetMap Map Server
 Bundle-SymbolicName: de.fhg.igd.mapviewer.server.openstreetmap;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.mapviewer;version="1.0.0",
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF
index c6943c6a04..a57ae869d0 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.server.tiles/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom Tile Service
 Bundle-SymbolicName: de.fhg.igd.mapviewer.server.tiles;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: wetransform GmbH
 Require-Bundle: de.fhg.igd.mapviewer,
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF
index f7ec435083..51cf6348fd 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.server.wms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WMS Map Server
 Bundle-SymbolicName: de.fhg.igd.mapviewer.server.wms;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.ui.util.extension,
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF
index dcd5318563..810cc96607 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.tools.boxzoom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Box Zoom Tool
 Bundle-SymbolicName: de.fhg.igd.mapviewer.tools.boxzoom;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.mapviewer;version="1.0.0",
diff --git a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF
index 43d58bf582..2307222f8b 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer.tools.default/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Default Tool
 Bundle-SymbolicName: de.fhg.igd.mapviewer.tools.default;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.mapviewer;version="1.0.0",
diff --git a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF
index 59f5efd027..d43b8d3405 100644
--- a/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.mapviewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Mapviewer
 Bundle-SymbolicName: de.fhg.igd.mapviewer;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base,
diff --git a/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF b/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF
index d1ca76a104..8992450a9e 100644
--- a/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF
+++ b/ext/styledmap/de.fhg.igd.swingrcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Swing RCP Bridge
 Bundle-SymbolicName: de.fhg.igd.swingrcp;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.4.1",
diff --git a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF
index 15576752cb..6764317426 100644
--- a/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF
+++ b/ext/styledmap/eu.esdihumboldt.hale.doc.user.views.styledmap/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Styled Map View User Documentation
 Bundle-SymbolicName: eu.esdihumboldt.hale.doc.user.views.styledmap;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml
index e79c7671ec..a487444836 100644
--- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml
+++ b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.views.styledmap.feature"
       label="Style Map View Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel, Fraunhofer IGD"
       plugin="eu.esdihumboldt.hale.ui.views.styledmap">
 
diff --git a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF
index c563023fa3..59c1133723 100644
--- a/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF
+++ b/ext/styledmap/eu.esdihumboldt.hale.ui.views.styledmap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Styled Map View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.styledmap;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.views.styledmap.internal.StyledMapBundle
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF b/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF
index 96ce1d2491..13276ec8d3 100644
--- a/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF
+++ b/ext/styledmap/org.jdesktop.swingx.mapviewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: TileMapKit
 Bundle-SymbolicName: org.jdesktop.swingx.mapviewer;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Export-Package: org.jdesktop.swingx.mapviewer;version="1.0.0";
diff --git a/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature.ui/feature.xml b/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature.ui/feature.xml
index 25c591585d..97ad1f8557 100644
--- a/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature.ui/feature.xml
+++ b/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature.ui/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.xslt.feature.ui"
       label="XSLT Mapping UI Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="Fraunhofer IGD"
       plugin="eu.esdihumboldt.hale.io.xslt">
 
diff --git a/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature/feature.xml b/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature/feature.xml
index 0ae92120be..4b220a068e 100644
--- a/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature/feature.xml
+++ b/ext/xslt/eu.esdihumboldt.hale.io.xslt.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.xslt.feature"
       label="XSLT Mapping Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="Fraunhofer IGD"
       plugin="eu.esdihumboldt.hale.io.xslt">
 
diff --git a/ext/xslt/eu.esdihumboldt.hale.io.xslt.test/META-INF/MANIFEST.MF b/ext/xslt/eu.esdihumboldt.hale.io.xslt.test/META-INF/MANIFEST.MF
index e3c4c5f9bb..ffb84805d5 100644
--- a/ext/xslt/eu.esdihumboldt.hale.io.xslt.test/META-INF/MANIFEST.MF
+++ b/ext/xslt/eu.esdihumboldt.hale.io.xslt.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment XSLT Export Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xslt.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.xslt;bundle-version="2.5.0",
diff --git a/ext/xslt/eu.esdihumboldt.hale.io.xslt.ui/META-INF/MANIFEST.MF b/ext/xslt/eu.esdihumboldt.hale.io.xslt.ui/META-INF/MANIFEST.MF
index c0e3402f6e..2839e30621 100644
--- a/ext/xslt/eu.esdihumboldt.hale.io.xslt.ui/META-INF/MANIFEST.MF
+++ b/ext/xslt/eu.esdihumboldt.hale.io.xslt.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XSLT UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xslt.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.io.xslt.ui.internal.XsltUI
 Bundle-Vendor: Fraunhofer IGD
 Require-Bundle: org.eclipse.ui,
diff --git a/ext/xslt/eu.esdihumboldt.hale.io.xslt/META-INF/MANIFEST.MF b/ext/xslt/eu.esdihumboldt.hale.io.xslt/META-INF/MANIFEST.MF
index 08a16af5aa..ad68d654e8 100644
--- a/ext/xslt/eu.esdihumboldt.hale.io.xslt/META-INF/MANIFEST.MF
+++ b/ext/xslt/eu.esdihumboldt.hale.io.xslt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Alignment XSLT Export
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xslt;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Fraunhofer IGD
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="11.0.1",
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.core.ui/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.core.ui/feature.xml
index 3777879a24..91697ca191 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.core.ui/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.core.ui/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.core.ui"
       label="UI Support for Core I/O Providers"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel">
 
    <license>
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.core/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.core/feature.xml
index bc28d4652e..38c2912f9e 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.core/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.core/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.core"
       label="Core I/O Providers"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
@@ -266,20 +266,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="de.interactive_instruments.xtraserver-config-util"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="eu.esdihumboldt.hale.io.xtraserver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="eu.esdihumboldt.hale.io.groovy"
          download-size="0"
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.deegree/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.deegree/feature.xml
index 4c4e75b90d..8b787f0f04 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.deegree/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.deegree/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.deegree"
       label="Deegree I/O Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="wetransform GmbH">
 
    <description url="http://www.example.com/description">
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.html.ui/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.html.ui/feature.xml
index 33a79ff971..9b813ca930 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.html.ui/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.html.ui/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.html.ui"
       label="HTML Export UI Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.html/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.html/feature.xml
index eed782577d..340ca4c060 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.html/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.html/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.html"
       label="HTML Export Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.legacy/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.legacy/feature.xml
index a2bc48c442..9c31963bc9 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.legacy/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.legacy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.legacy"
       label="Legacy I/O providers"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.msaccess/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.msaccess/feature.xml
index e16f8f92c7..8c86b8fd13 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.msaccess/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.msaccess/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.msaccess"
       label="Hale MS Access Support"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="wetransfom GmbH"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/io/features/eu.esdihumboldt.hale.io.feature.mssql/feature.xml b/io/features/eu.esdihumboldt.hale.io.feature.mssql/feature.xml
index 5d861c4bc7..054b7d40d6 100644
--- a/io/features/eu.esdihumboldt.hale.io.feature.mssql/feature.xml
+++ b/io/features/eu.esdihumboldt.hale.io.feature.mssql/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.io.feature.mssql"
       label="HALE MS-SQL Support"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="wetransform GmbH"
       plugin="eu.esdihumboldt.hale.ui.application">
 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.codelist.skos.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.codelist.skos.test/META-INF/MANIFEST.MF
index 36c3215c84..1f8b0ab913 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.codelist.skos.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.codelist.skos.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test for SKOS reader
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.codelist.skos.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.codelist.skos;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: wetransform GmbH
diff --git a/io/plugins/eu.esdihumboldt.hale.io.codelist.skos/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.codelist.skos/META-INF/MANIFEST.MF
index 51110de3d5..2d895ba9fe 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.codelist.skos/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.codelist.skos/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Skos Reader
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.codelist.skos;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.slf4jplus,
  eu.esdihumboldt.hale.common.codelist,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.codelist.xml.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.codelist.xml.test/META-INF/MANIFEST.MF
index fb01ede574..fdcf7211d1 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.codelist.xml.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.codelist.xml.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML Codelist Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.codelist.xml.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Fragment-Host: eu.esdihumboldt.hale.io.codelist.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.codelist.xml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.codelist.xml/META-INF/MANIFEST.MF
index 5f0ed2b003..77eaabd5a7 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.codelist.xml/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.codelist.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML CodeList I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.codelist.xml;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.io;version="1.6.0",
  com.ibm.icu.impl,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.csv.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.csv.test/META-INF/MANIFEST.MF
index d179f736c7..59c36034b2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.csv.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.csv.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CSV Schema/Instance I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.csv.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.csv;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.cst.test,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.csv.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.csv.ui/META-INF/MANIFEST.MF
index 56701ddc2d..1abe4d96e2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.csv.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.csv.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CSV Schema/Instance I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.csv.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.2",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF
index bcba13ccb2..0ae6b7d83f 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.csv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CSV Schema/Instance I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.csv;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: au.com.bytecode.opencsv;version="2.3.0",
  com.google.common.collect;version="1.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.deegree.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.deegree.test/META-INF/MANIFEST.MF
index 6fd49c8697..6a3ce77729 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.deegree.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.deegree.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deegree I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.deegree.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Fragment-Host: eu.esdihumboldt.hale.io.deegree;bundle-version="3.4.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.deegree.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.deegree.ui/META-INF/MANIFEST.MF
index 897f351b55..a3bbc13090 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.deegree.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.deegree.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deegree I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.deegree.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Automatic-Module-Name: eu.esdihumboldt.hale.io.deegree.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.109.100",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.deegree/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.deegree/META-INF/MANIFEST.MF
index 7e90f665a2..eb75ac7796 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.deegree/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.deegree/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Deegree I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.deegree;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.3.7",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF
index ca7b35093e..2719d4a235 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geopackage Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.geopackage.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.geopackage;bundle-version="4.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy
index 943644c405..34121900b5 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.test/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriterTest.groovy
@@ -46,6 +46,7 @@ import eu.esdihumboldt.hale.common.schema.model.constraint.type.Binding
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.PrimaryKey
 import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace
 import groovy.transform.CompileStatic
+import mil.nga.geopackage.manager.GeoPackageManager
 
 /**
  * Tests for writing instances to GeoPackage.
@@ -523,4 +524,121 @@ class GeopackageInstanceWriterTest {
 			writer.setTargetCRS(new CodeDefinition('EPSG:25832'))
 		}
 	}
+
+	@Test
+	void testNgaSpatialIndexCreation() {
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( createGeometry('POINT(48.137222 11.575556)', 4326) )
+			}
+		}
+
+		withNewGeopackage(schema, instances) { file ->
+			def loaded = GeopackageInstanceReaderTest.loadInstances(file)
+
+			def gpkg = GeoPackageManager.open(file, true)
+			assert gpkg.extensionsDao?.isTableExists()
+			assert gpkg.extensionsDao?.queryForAll().any { it.extensionName == "nga_geometry_index" }
+		} { GeopackageInstanceWriter writer ->
+			writer.setSpatialIndexType("nga")
+			writer.setTargetCRS(new CodeDefinition('EPSG:25832'))
+		}
+	}
+
+	@Test
+	void testRTreeSpatialIndexCreation() {
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( createGeometry('POINT(48.137222 11.575556)', 4326) )
+			}
+		}
+
+		withNewGeopackage(schema, instances) { file ->
+			def loaded = GeopackageInstanceReaderTest.loadInstances(file)
+
+			def gpkg = GeoPackageManager.open(file, true)
+			assert gpkg.extensionsDao?.isTableExists()
+			assert gpkg.extensionsDao?.queryForAll().any { it.extensionName == "gpkg_rtree_index" }
+		} { GeopackageInstanceWriter writer ->
+			writer.setSpatialIndexType("rtree")
+			writer.setTargetCRS(new CodeDefinition('EPSG:25832'))
+		}
+	}
+
+	@Test
+	void testNoSpatialIndexCreation() {
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( createGeometry('POINT(48.137222 11.575556)', 4326) )
+			}
+		}
+
+		withNewGeopackage(schema, instances) { file ->
+			def loaded = GeopackageInstanceReaderTest.loadInstances(file)
+
+			def gpkg = GeoPackageManager.open(file, true)
+			if (gpkg.extensionsDao?.isTableExists()) {
+				// In case the extensions table was created by some other extension,
+				// make sure that NGA and RTree extensions are not loaded
+				assert !gpkg.extensionsDao.queryForAll().any {
+					it.extensionName in [
+						"gpkg_rtree_index",
+						"nga_geometry_index"
+					]
+				}
+			}
+		} { GeopackageInstanceWriter writer ->
+			writer.setSpatialIndexType("none")
+			writer.setTargetCRS(new CodeDefinition('EPSG:25832'))
+		}
+	}
+
 }
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/META-INF/MANIFEST.MF
index f270b3f6bc..5d224b8e66 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/META-INF/MANIFEST.MF
@@ -2,8 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geopackage support UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.geopackage.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui,
- eu.esdihumboldt.hale.io.geopackage;bundle-version="4.0.0"
+ eu.esdihumboldt.hale.io.geopackage;bundle-version="4.0.0",
+ eu.esdihumboldt.hale.common.instance;bundle-version="4.0.0",
+ eu.esdihumboldt.hale.common.core;bundle-version="4.0.0",
+ org.eclipse.ui;bundle-version="3.116.0",
+ eu.esdihumboldt.hale.ui.util;bundle-version="4.0.0"
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/plugin.xml b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/plugin.xml
index e502cf135a..1a35aa600b 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/plugin.xml
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/plugin.xml
@@ -10,6 +10,13 @@
                ref="eu.esdihumboldt.hale.io.geopackage.instance.writer">
          </provider>
       </configPage>
+      <configPage
+            class="eu.esdihumboldt.hale.io.geopackage.ui.GeopackageWriterSettingsPage"
+            order="1">
+         <provider
+               ref="eu.esdihumboldt.hale.io.geopackage.instance.writer">
+         </provider>
+      </configPage>
    </extension>
 
 </plugin>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/src/eu/esdihumboldt/hale/io/geopackage/ui/GeopackageWriterSettingsPage.java b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/src/eu/esdihumboldt/hale/io/geopackage/ui/GeopackageWriterSettingsPage.java
new file mode 100644
index 0000000000..e1a7d21692
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage.ui/src/eu/esdihumboldt/hale/io/geopackage/ui/GeopackageWriterSettingsPage.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.io.geopackage.ui;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+
+import eu.esdihumboldt.hale.io.geopackage.GeopackageInstanceWriter;
+import eu.esdihumboldt.hale.io.geopackage.GeopackageSpatialIndexType;
+import eu.esdihumboldt.hale.ui.io.IOWizard;
+import eu.esdihumboldt.hale.ui.io.config.AbstractConfigurationPage;
+import eu.esdihumboldt.hale.ui.util.viewer.EnumContentProvider;
+
+/**
+ * Configuration page for {@link GeopackageInstanceWriter} settings.
+ * 
+ * @author Florian Esser
+ */
+public class GeopackageWriterSettingsPage extends
+		AbstractConfigurationPage<GeopackageInstanceWriter, IOWizard<GeopackageInstanceWriter>> {
+
+	private ComboViewer spatialIndexType;
+
+	/**
+	 * Default constructor
+	 */
+	public GeopackageWriterSettingsPage() {
+		super("gpkg.settings");
+
+		setTitle("GeoPackage Writer settings");
+		setDescription("Settings for the GeoPackage writer");
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.HaleWizardPage#onShowPage(boolean)
+	 */
+	@Override
+	protected void onShowPage(boolean firstShow) {
+		super.onShowPage(firstShow);
+		if (firstShow) {
+			spatialIndexType
+					.setSelection(new StructuredSelection(GeopackageSpatialIndexType.RTREE));
+		}
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.config.AbstractConfigurationPage#enable()
+	 */
+	@Override
+	public void enable() {
+		// do nothing
+
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.config.AbstractConfigurationPage#disable()
+	 */
+	@Override
+	public void disable() {
+		// do nothing
+
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.IOWizardPage#updateConfiguration(eu.esdihumboldt.hale.common.core.io.IOProvider)
+	 */
+	@Override
+	public boolean updateConfiguration(GeopackageInstanceWriter provider) {
+		setMessage("Settings for the GeoPackage writer");
+
+		GeopackageSpatialIndexType indexType = GeopackageSpatialIndexType.RTREE;
+		ISelection order = spatialIndexType.getSelection();
+		if (!order.isEmpty() && order instanceof IStructuredSelection) {
+			Object selected = ((IStructuredSelection) spatialIndexType.getSelection())
+					.getFirstElement();
+			if (selected instanceof GeopackageSpatialIndexType) {
+				indexType = (GeopackageSpatialIndexType) selected;
+			}
+		}
+		provider.setSpatialIndexType(indexType.getParameterValue());
+
+		return true;
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.HaleWizardPage#createContent(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void createContent(Composite page) {
+		page.setLayout(new GridLayout(1, false));
+		GridDataFactory groupData = GridDataFactory.fillDefaults().grab(true, false);
+
+		Group spatialIndexGroup = new Group(page, SWT.NONE);
+		spatialIndexGroup.setText("Spatial index");
+		GridLayoutFactory.swtDefaults().numColumns(2).applyTo(spatialIndexGroup);
+		groupData.applyTo(spatialIndexGroup);
+
+		Label spatialIndexTypeLabel = new Label(spatialIndexGroup, SWT.NONE);
+		GridDataFactory.swtDefaults().align(SWT.FILL, SWT.CENTER).applyTo(spatialIndexTypeLabel);
+		spatialIndexTypeLabel.setText("Type of spatial index to create:");
+
+		spatialIndexType = new ComboViewer(spatialIndexGroup);
+		// TODO Replace by extension-based approach where index types are
+		// provided via an extension point, similar to the way
+		// InterpolationAlgorithm is handled
+		spatialIndexType.setContentProvider(EnumContentProvider.getInstance());
+		spatialIndexType.setLabelProvider(new LabelProvider() {
+
+			@Override
+			public String getText(Object element) {
+				if (element instanceof GeopackageSpatialIndexType) {
+					return ((GeopackageSpatialIndexType) element).getDescription();
+				}
+				return super.getText(element);
+			}
+		});
+		spatialIndexType.setInput(GeopackageSpatialIndexType.class);
+	}
+
+}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF
index cfe33a2d47..be1707dda2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale Geopackage Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.geopackage;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.schema;bundle-version="4.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage/plugin.xml b/io/plugins/eu.esdihumboldt.hale.io.geopackage/plugin.xml
index dd1b3c3b69..afe9503bb9 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage/plugin.xml
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage/plugin.xml
@@ -42,7 +42,7 @@
                ref="eu.esdihumboldt.hale.io.geopackage">
          </contentType>
          <providerParameter
-               description="Allows to provide a WHERE clause filter for tables in the GeoPackage. One WHERE clause per table can be defined. The syntax is &quot;&lt;table name 1&gt;|&lt;WHERE clause 1||&lt;table name 2&gt;|&lt;WHERE clause 2&gt;||...&quot;"
+               description="Allows to provide a WHERE clause filter for tables in the GeoPackage. One WHERE clause per table can be defined. The syntax is &quot;&amp;lt;table name 1&amp;gt;|&amp;lt;WHERE clause 1&amp;gt;||&amp;lt;table name 2&amp;gt;|&amp;lt;WHERE clause 2&amp;gt;||...&quot;"
                label="Filters for querying the GeoPackage database"
                name="queryFilter"
                optional="true">
@@ -64,6 +64,19 @@
                   sampleDescription="Reference systems can be defined either as code or WKT (preceded with code: or wkt: respectively)">
             </valueDescriptor>
          </providerParameter>
+         <providerParameter
+               description="Type of spatial index to use when new tables are created in the target GeoPackage file"
+               label="Type of spatial index"
+               name="spatialindex.type"
+               optional="true">
+            <parameterBinding
+                  class="java.lang.String">
+            </parameterBinding>
+            <valueDescriptor
+                  default="rtree"
+                  defaultDescription="By default, an RTree Spatial Index is created">
+            </valueDescriptor>
+         </providerParameter>
       </provider>
    </extension>
 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java b/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java
index 5c814a30ee..1a90544a37 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageInstanceWriter.java
@@ -20,6 +20,7 @@
 import java.math.BigInteger;
 import java.net.URI;
 import java.sql.SQLException;
+import java.text.MessageFormat;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -33,10 +34,6 @@
 
 import org.geotools.geometry.jts.JTS;
 import org.geotools.referencing.CRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.springframework.core.convert.ConversionException;
-
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.geom.MultiLineString;
@@ -45,10 +42,14 @@
 import org.locationtech.jts.geom.Point;
 import org.locationtech.jts.geom.Polygon;
 import org.locationtech.jts.io.WKBWriter;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.springframework.core.convert.ConversionException;
 
 import eu.esdihumboldt.hale.common.convert.ConversionUtil;
 import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
 import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
+import eu.esdihumboldt.hale.common.core.io.Value;
 import eu.esdihumboldt.hale.common.core.io.report.IOReport;
 import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
 import eu.esdihumboldt.hale.common.core.io.report.impl.IOMessageImpl;
@@ -79,7 +80,10 @@
 import mil.nga.geopackage.core.srs.SpatialReferenceSystem;
 import mil.nga.geopackage.core.srs.SpatialReferenceSystemDao;
 import mil.nga.geopackage.db.GeoPackageDataType;
+import mil.nga.geopackage.extension.index.FeatureTableIndex;
 import mil.nga.geopackage.features.columns.GeometryColumns;
+import mil.nga.geopackage.features.index.FeatureIndexManager;
+import mil.nga.geopackage.features.index.FeatureIndexType;
 import mil.nga.geopackage.features.user.FeatureColumn;
 import mil.nga.geopackage.features.user.FeatureDao;
 import mil.nga.geopackage.features.user.FeatureRow;
@@ -98,6 +102,30 @@
  */
 public class GeopackageInstanceWriter extends AbstractGeoInstanceWriter {
 
+	/**
+	 * The identifier of the writer as registered to the I/O provider extension.
+	 */
+	public static final String ID = "eu.esdihumboldt.hale.io.geopackage.instance.writer";
+
+	/**
+	 * Parameter to define the type of spatial index to create for new tables
+	 */
+	public static final String PARAM_SPATIAL_INDEX_TYPE = "spatialindex.type";
+
+	/**
+	 * Default value assumed when spatial index type is not specified
+	 */
+	public static final String DEFAULT_SPATIAL_INDEX_TYPE = "rtree";
+
+	/**
+	 * Set the type of spatial index to create for new tables
+	 * 
+	 * @param spatialIndexType Spatial index type to use
+	 */
+	public void setSpatialIndexType(String spatialIndexType) {
+		setParameter(PARAM_SPATIAL_INDEX_TYPE, Value.of(spatialIndexType));
+	}
+
 	@Override
 	public boolean isPassthrough() {
 		return isWriteUnordered();
@@ -121,6 +149,7 @@ public boolean isCancelable() {
 	@Override
 	protected IOReport execute(ProgressIndicator progress, IOReporter reporter)
 			throws IOProviderConfigurationException, IOException {
+		progress.begin("Generating Geopackage", ProgressIndicator.UNKNOWN);
 		InstanceCollection instances = getInstances();
 
 		GeoPackage geoPackage = null;
@@ -415,6 +444,24 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 			}
 
 			geoPackage.createFeatureTableWithMetadata(geometryColumns, boundingBox, srsId, columns);
+
+			FeatureDao featureDao = geoPackage.getFeatureDao(tableName);
+			String spatialIndexType = getParameter(PARAM_SPATIAL_INDEX_TYPE).as(String.class,
+					DEFAULT_SPATIAL_INDEX_TYPE);
+			switch (spatialIndexType.toLowerCase()) {
+			case "nga":
+				createFeatureTableIndex(geoPackage, featureDao);
+				break;
+			case "rtree":
+				createRTreeIndex(geoPackage, featureDao);
+				break;
+			case "none":
+				// Do nothing
+				break;
+			default:
+				throw new IllegalArgumentException(MessageFormat.format(
+						"Unknown or unsupported spatial index type \"{0}\"", spatialIndexType));
+			}
 		}
 		else {
 			// create attributes table
@@ -436,6 +483,17 @@ private GeopackageTableType createTableIfNecessary(GeoPackage geoPackage, String
 		return tableType;
 	}
 
+	private void createRTreeIndex(GeoPackage geoPackage, FeatureDao featureDao) {
+		FeatureIndexManager indexer = new FeatureIndexManager(geoPackage, featureDao);
+		indexer.setIndexLocation(FeatureIndexType.RTREE);
+		indexer.index();
+	}
+
+	private void createFeatureTableIndex(GeoPackage geoPackage, FeatureDao featureDao) {
+		FeatureTableIndex idx = new FeatureTableIndex(geoPackage, featureDao);
+		idx.index();
+	}
+
 	private long determineSrsId(GeoPackage geoPackage, PropertyDefinition geomProp,
 			Instance instance, SimpleLog log) throws SQLException {
 		GeometryMetadata geomMetadata = geomProp.getPropertyType()
@@ -510,7 +568,9 @@ private SpatialReferenceSystem createEpsgSrs(GeoPackage geoPackage, CodeDefiniti
 		// XXX not sure what the difference between the definition types is
 		srs.setDefinition(wkt);
 		srs.setDefinition_12_063(wkt);
-		srs.setDescription(geoCrs.getRemarks().toString());
+		if (geoCrs.getRemarks() != null) {
+			srs.setDescription(geoCrs.getRemarks().toString());
+		}
 		srsDao.create(srs);
 		return srs;
 	}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSpatialIndexType.java b/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSpatialIndexType.java
new file mode 100644
index 0000000000..9bd7a71690
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.geopackage/src/eu/esdihumboldt/hale/io/geopackage/GeopackageSpatialIndexType.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.io.geopackage;
+
+/**
+ * 
+ * Modes for determining which spatial index should be used when writing a new
+ * GeoPackage file.
+ * 
+ * TODO Replace by extension-based approach where index types are provided via
+ * an extension point, similar to the way InterpolationAlgorithm is handled
+ * 
+ * @author Florian Esser
+ */
+public enum GeopackageSpatialIndexType {
+
+	/**
+	 * RTree spatial index, see
+	 * http://www.geopackage.org/spec121/#extension_rtree
+	 */
+	RTREE("RTree Spatial Index", "rtree"),
+
+	/**
+	 * NGA Geometry Index, see
+	 * http://ngageoint.github.io/GeoPackage/docs/extensions/geometry-index.
+	 * html
+	 */
+	NGA("NGA Geometry Index", "nga"),
+
+	/**
+	 * No spatial index
+	 */
+	NONE("Disable index creation", "none");
+
+	private final String description;
+	private final String parameterValue;
+
+	GeopackageSpatialIndexType(String description, String parameterValue) {
+		this.description = description;
+		this.parameterValue = parameterValue;
+	}
+
+	@SuppressWarnings("javadoc")
+	public String getDescription() {
+		return description;
+	}
+
+	@SuppressWarnings("javadoc")
+	public String getParameterValue() {
+		return parameterValue;
+	}
+}
\ No newline at end of file
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/META-INF/MANIFEST.MF
index 4e01299542..425cc6dea4 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GML Geometry Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml.geometry.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.osgi.util;version="1.0.0",
  eu.esdihumboldt.hale.common.test,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/arcstring/sample-arcstring-gml32.xml b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/arcstring/sample-arcstring-gml32.xml
new file mode 100644
index 0000000000..b035407889
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/arcstring/sample-arcstring-gml32.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<gml:FeatureCollection gml:id="fcollection"
+	xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:hale="eu:esdihumboldt:hale:test"
+	xsi:schemaLocation="eu:esdihumboldt:hale:test geom-gml32.xsd http://www.opengis.net/gml/3.2 http://schemas.opengis.net/gml/3.2.1/gml.xsd">
+	<gml:boundedBy>
+		<gml:Null></gml:Null>
+	</gml:boundedBy>
+  <gml:featureMember>
+		<hale:ArcStringProperty gml:id="ageom1">
+			<hale:geometry gml:id="LineString1" srsName="EPSG:25832">
+				<gml:posList>552400.131 5941061.830 552211.949 5941201.903 552048.407 5941370.089 551881.562 5941562.239 551735.790 5941770.827</gml:posList>
+			</hale:geometry>
+		</hale:ArcStringProperty>
+	</gml:featureMember>
+</gml:FeatureCollection>
\ No newline at end of file
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/gml/geom-gml32.xsd b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/gml/geom-gml32.xsd
index 7acfea72cb..9ab8804019 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/gml/geom-gml32.xsd
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/data/gml/geom-gml32.xsd
@@ -91,6 +91,19 @@
 			</extension>
 		</complexContent>
 	</complexType>
+	
+	<element name="ArcStringProperty" substitutionGroup="gml:AbstractFeature"
+		type="hale:ArcStringPropertyType" />
+
+	<complexType name="ArcStringPropertyType">
+		<complexContent>
+			<extension base="gml:AbstractFeatureType">
+				<sequence>
+					<element name="geometry" type="gml:ArcStringType" />
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
 
 	<element name="PolygonProperty" substitutionGroup="gml:AbstractFeature"
 		type="hale:PolygonPropertyType" />
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandlerTest.java b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandlerTest.java
new file mode 100644
index 0000000000..c0570af5f3
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandlerTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.io.gml.geometry.handler;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.function.Consumer;
+
+import org.junit.Test;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Geometry;
+import org.locationtech.jts.geom.LineString;
+
+import eu.esdihumboldt.hale.common.instance.model.Instance;
+import eu.esdihumboldt.hale.common.instance.model.InstanceCollection;
+import eu.esdihumboldt.hale.common.instance.model.ResourceIterator;
+import eu.esdihumboldt.hale.io.gml.geometry.handler.internal.AbstractHandlerTest;
+
+/**
+ * Test for interpolating ArcString geometries
+ * 
+ * @author Johanna Ott
+ */
+public class ArcStringHandlerTest extends AbstractHandlerTest {
+
+	private Consumer<Geometry> checker;
+	private LineString reference;
+
+	@Override
+	public void init() {
+		super.init();
+
+		// define expected values
+		Coordinate start = new Coordinate(552400.131, 5941061.83);
+		Coordinate end = new Coordinate(551735.79, 5941770.827);
+		int coordinateCount = 16385;
+
+		checker = combine(startEndChecker(start, end, coordinateCount), noCoordinatePairs());
+
+	}
+
+	/**
+	 * Test linestring geometries read from a GML 2 file
+	 * 
+	 * @throws Exception if an error occurs
+	 */
+	@Test
+	public void testArcStringGml32() throws Exception {
+		InstanceCollection instances = AbstractHandlerTest.loadXMLInstances(
+				getClass().getResource("/data/gml/geom-gml32.xsd").toURI(),
+				getClass().getResource("/data/arcstring/sample-arcstring-gml32.xml").toURI());
+
+		ResourceIterator<Instance> it = instances.iterator();
+		try {
+			assertTrue("ArcString is not interpolated correctly", it.hasNext());
+			Instance instance = it.next();
+			checkSingleGeometry(instance, checker);
+		} finally {
+			it.close();
+		}
+	}
+}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/internal/AbstractHandlerTest.java b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/internal/AbstractHandlerTest.java
index 84661dd73c..4254e5233c 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/internal/AbstractHandlerTest.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry.test/src/eu/esdihumboldt/hale/io/gml/geometry/handler/internal/AbstractHandlerTest.java
@@ -170,6 +170,27 @@ protected Consumer<Geometry> referenceChecker(Geometry referenceGeometry, double
 		};
 	}
 
+	/**
+	 * Creates a geometry checker that checks for equality of the first and last
+	 * point and of the number of coordinates
+	 * 
+	 * @param start the starting point of the geometry
+	 * @param end the end point of the geometry
+	 * @param coordinateCount the number of coordinates contained in the
+	 *            geometry
+	 * @return the checker
+	 */
+	protected Consumer<Geometry> startEndChecker(Coordinate start, Coordinate end,
+			int coordinateCount) {
+		return (geom) -> {
+			assertEquals("Number of coordinates does not match", coordinateCount,
+					geom.getCoordinates().length);
+			assertTrue("Start coordinate does not match", geom.getCoordinates()[0].equals2D(start));
+			assertTrue("End coordinate does not match",
+					geom.getCoordinates()[coordinateCount - 1].equals2D(end));
+		};
+	}
+
 	/**
 	 * Check a single geometry contained in an instance (at an arbitrary path).
 	 * 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF
index 350377f9e1..3b4a33b348 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GML schema geometry support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml.geometry
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.collect;version="9.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandler.java b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandler.java
index a9caa2d81e..c6d4b1a216 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandler.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.geometry/src/eu/esdihumboldt/hale/io/gml/geometry/handler/ArcStringHandler.java
@@ -80,7 +80,7 @@ public Object createGeometry(Instance instance, int srsDimension, IOProvider rea
 					"Arc string must be defined by at least three points");
 		}
 		List<Arc> arcs = new ArrayList<>();
-		for (int i = 0; i < coords.length - 2; i += 3) {
+		for (int i = 0; i < coords.length - 2; i += 2) {
 			Arc arc = new ArcByPointsImpl(coords[i], coords[i + 1], coords[i + 2]);
 			arcs.add(arc);
 		}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF
index f1813196a4..4297db3445 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GML/XML Instance I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.collect;version="9.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF
index e06bb3a8b9..494f543686 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GML/XML Instance I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui;bundle-version="2.2.0",
  eu.esdihumboldt.hale.io.gml;bundle-version="2.2.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/src/eu/esdihumboldt/hale/io/gml/ui/GmlWriterSettingsPage.java b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/src/eu/esdihumboldt/hale/io/gml/ui/GmlWriterSettingsPage.java
index b0b36811fe..e869b29dd8 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml.ui/src/eu/esdihumboldt/hale/io/gml/ui/GmlWriterSettingsPage.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml.ui/src/eu/esdihumboldt/hale/io/gml/ui/GmlWriterSettingsPage.java
@@ -123,7 +123,7 @@ protected void createContent(Composite page) {
 		prettyPrint = new Button(xml, SWT.CHECK);
 		prettyPrint.setText("Pretty print XML");
 		// default
-		prettyPrint.setSelection(false);
+		prettyPrint.setSelection(true);
 
 		Group geom = new Group(page, SWT.NONE);
 		geom.setLayout(new GridLayout(1, false));
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF
index 30cb51e3f3..57e2d493d7 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GML/XML Instance I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.gml;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.geotools;bundle-version="2.6.4",
  eu.esdihumboldt.hale.common.core;bundle-version="2.2.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.gml/src/eu/esdihumboldt/hale/io/gml/internal/simpletype/SimpleTypeUtil.java b/io/plugins/eu.esdihumboldt.hale.io.gml/src/eu/esdihumboldt/hale/io/gml/internal/simpletype/SimpleTypeUtil.java
index 152506cb91..32d403a186 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.gml/src/eu/esdihumboldt/hale/io/gml/internal/simpletype/SimpleTypeUtil.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.gml/src/eu/esdihumboldt/hale/io/gml/internal/simpletype/SimpleTypeUtil.java
@@ -84,7 +84,17 @@ public static <T> String convertToXml(T value, TypeDefinition type) {
 		if (simpleType != null) {
 			try {
 				XmlAnySimpleType simpleTypeValue = conversionService.convert(value, simpleType);
-				if (simpleTypeValue instanceof XmlDateTime) {
+				if (simpleTypeValue instanceof XmlDate) {
+					XmlDate xmlDate = (XmlDate) simpleTypeValue;
+					Calendar calendar = xmlDate.getCalendarValue();
+					GDateBuilder builder = new GDateBuilder(calendar);
+					// remove time zone as value contains no time information
+					builder.clearTimeZone();
+					GDate gdate = builder.toGDate();
+
+					xmlDate.setGDateValue(gdate);
+				}
+				else if (simpleTypeValue instanceof XmlDateTime) {
 					XmlDateTime xmlDateTime = (XmlDateTime) simpleTypeValue;
 
 					// use Zulu time to have a reproducable result
@@ -100,6 +110,7 @@ public static <T> String convertToXml(T value, TypeDefinition type) {
 
 					xmlDateTime.setGDateValue(gdate);
 				}
+
 				if (simpleTypeValue != null) {
 					return simpleTypeValue.getStringValue();
 				}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.groovy.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.groovy.test/META-INF/MANIFEST.MF
index 82e5fd1e41..3f32b4ac14 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.groovy.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.junit;version="4.12.0"
diff --git a/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/META-INF/MANIFEST.MF
index 9c97d28be0..aa9fb21460 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.groovy.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: wetransform GmbH
 Require-Bundle: eu.esdihumboldt.hale.ui;bundle-version="3.4.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/src/eu/esdihumboldt/hale/io/groovy/ui/snippets/SnippetUIAdvisor.java b/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/src/eu/esdihumboldt/hale/io/groovy/ui/snippets/SnippetUIAdvisor.java
index bd334e8b58..3d9430c3f4 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/src/eu/esdihumboldt/hale/io/groovy/ui/snippets/SnippetUIAdvisor.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.groovy.ui/src/eu/esdihumboldt/hale/io/groovy/ui/snippets/SnippetUIAdvisor.java
@@ -33,7 +33,7 @@ public Class<Snippet> getRepresentationType() {
 	}
 
 	@Override
-	public boolean supportsRemoval() {
+	public boolean supportsRemoval(String resourceId) {
 		return true;
 	}
 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.groovy/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.groovy/META-INF/MANIFEST.MF
index 76aa745b17..70c2893534 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.groovy/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.core;bundle-version="3.4.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.groovy/src/eu/esdihumboldt/hale/io/groovy/snippets/impl/FileSnippet.java b/io/plugins/eu.esdihumboldt.hale.io.groovy/src/eu/esdihumboldt/hale/io/groovy/snippets/impl/FileSnippet.java
index 430f1cc736..6bdfe98587 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.groovy/src/eu/esdihumboldt/hale/io/groovy/snippets/impl/FileSnippet.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.groovy/src/eu/esdihumboldt/hale/io/groovy/snippets/impl/FileSnippet.java
@@ -34,7 +34,7 @@ public class FileSnippet implements Snippet {
 	private final String id;
 	private final Charset encoding;
 
-	private final long lastMod = -1;
+	private long lastMod = -1;
 	private Script lastScript = null;
 
 	/**
@@ -62,6 +62,7 @@ public synchronized Script getScript(ServiceProvider services) throws Exception
 		if (mod > lastMod || lastScript == null) {
 			lastScript = SnippetReaderImpl.loadSnippet(new FileIOSupplier(snippetFile), services,
 					encoding);
+			lastMod = mod;
 		}
 
 		return lastScript;
diff --git a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/META-INF/MANIFEST.MF
index e9e4fbb180..234766c93e 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale connect integration UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.haleconnect.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.107.0",
  org.eclipse.core.runtime;bundle-version="3.11.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/ChooseHaleConnectProjectWizardPage.groovy b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/ChooseHaleConnectProjectWizardPage.groovy
index 8906f55d91..8c589c56dc 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/ChooseHaleConnectProjectWizardPage.groovy
+++ b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/ChooseHaleConnectProjectWizardPage.groovy
@@ -83,6 +83,11 @@ public class ChooseHaleConnectProjectWizardPage extends ConfigurationWizardPage<
 	private TableViewer projects;
 
 	private class GetProjectsCallback implements FutureCallback<List<HaleConnectProjectInfo>> {
+		String orgId
+
+		public GetProjectsCallback(String orgId) {
+			this.orgId = orgId
+		}
 
 		@Override
 		public void onSuccess(List<HaleConnectProjectInfo> result) {
@@ -125,13 +130,19 @@ public class ChooseHaleConnectProjectWizardPage extends ConfigurationWizardPage<
 								return;
 							}
 
-							if (t instanceof HaleConnectException
-							&& ((HaleConnectException) t).getStatusCode() == 401) {
-								// In case of 401 (Unauthorized) the most likely cause
-								// is that the API token has expired
-								log.userError(
-										"Unable to retrieve projects from hale connect due to missing permissions. Please re-login and try again.");
-								return;
+							if (t instanceof HaleConnectException) {
+								if (((HaleConnectException) t).getStatusCode() == 401) {
+									// In case of 401 (Unauthorized) the most likely cause
+									// is that the API token has expired
+									log.userError(
+											"Unable to retrieve projects from hale connect due to missing permissions. Please re-login and try again.");
+									return;
+								}
+								else if (((HaleConnectException) t).getStatusCode() == 403) {
+									// In case of 403 (Forbidden) ignore error and only log affected organisation id
+									log.error("Could not complete request for organisation ${orgId}", t)
+									return;
+								}
 							}
 
 							String configuredBasePath = haleConnect.getBasePathManager()
@@ -425,9 +436,11 @@ public class ChooseHaleConnectProjectWizardPage extends ConfigurationWizardPage<
 		projects.getTable().setEnabled(false);
 
 		try {
-			Futures.addCallback(haleConnect.getProjectsAsync(null), new GetProjectsCallback(), MoreExecutors.directExecutor());
+			// Check for user context (no org context)
+			Futures.addCallback(haleConnect.getProjectsAsync(null), new GetProjectsCallback('<null> (no org context)'), MoreExecutors.directExecutor());
+
 			for (String orgId : haleConnect.getSession().getOrganisationIds()) {
-				Futures.addCallback(haleConnect.getProjectsAsync(orgId), new GetProjectsCallback(), MoreExecutors.directExecutor());
+				Futures.addCallback(haleConnect.getProjectsAsync(orgId), new GetProjectsCallback(orgId), MoreExecutors.directExecutor());
 			}
 
 		} catch (HaleConnectException e1) {
diff --git a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/HaleConnectTarget.java b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/HaleConnectTarget.java
index e8af199dec..1493db365e 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/HaleConnectTarget.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.haleconnect.ui/src/eu/esdihumboldt/hale/io/haleconnect/ui/projects/HaleConnectTarget.java
@@ -154,6 +154,7 @@ public void widgetSelected(SelectionEvent e) {
 						.createLoginDialog(Display.getCurrent().getActiveShell());
 				if (loginDialog != null && loginDialog.open() == Dialog.OK) {
 					HaleConnectLoginHandler.performLogin(loginDialog);
+					updateLoginStatus();
 					updateState();
 					prefillTargetProject();
 				}
@@ -392,11 +393,20 @@ private void prefillTargetProject() {
 	 * Update the page state.
 	 */
 	protected void updateState() {
-		updateLoginStatus();
 		updateOverwriteWarning();
 
-		setValid(haleConnect.isLoggedIn() && (ownerUser.isEnabled() || ownerOrg.isEnabled())
-				&& (newProject.getSelection() || targetProject != null));
+		boolean valid = haleConnect.isLoggedIn();
+		// Creating or updating transformation projects is only possible
+		// if the current user has sufficient permissions to create
+		// projects either in the user or in an organization context
+		valid = valid && (ownerUser.getEnabled() || ownerOrg.getEnabled());
+		if (!newProject.getSelection()) {
+			// If the option to update an existing project is selected,
+			// a target project must be selected before proceeding.
+			valid = valid && (targetProject != null);
+		}
+		setValid(valid);
+
 		if (newProject.getSelection()) {
 			controlsStackLayout.topControl = newProjectControls;
 			createNewProject = true;
@@ -411,6 +421,7 @@ protected void updateState() {
 	@Override
 	public void onShowPage(boolean firstShow) {
 		super.onShowPage(firstShow);
+		updateLoginStatus();
 		updateState();
 	}
 
@@ -473,7 +484,6 @@ private void updateLoginStatus() {
 		ownershipGroup.setEnabled(loggedIn);
 		enableVersioning.setEnabled(loggedIn);
 		publicAccess.setEnabled(loggedIn);
-		ownerUser.setEnabled(loggedIn);
 		includeWebResources.setEnabled(loggedIn);
 		excludeData.setEnabled(loggedIn);
 		excludeCachedResources.setEnabled(loggedIn);
@@ -481,6 +491,12 @@ private void updateLoginStatus() {
 		newProject.setEnabled(loggedIn);
 		updateProject.setEnabled(loggedIn);
 
+		// Disable owner buttons by default because permission checks are
+		// needed to determine if either one is allowed for the current
+		// user.
+		ownerUser.setEnabled(false);
+		ownerOrg.setEnabled(false);
+
 		if (loggedIn) {
 			loginStatusLabel
 					.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GREEN));
@@ -504,7 +520,6 @@ private void updateLoginStatus() {
 				}
 			}
 
-			ownerOrg.setEnabled(false);
 			orgSelector.getCombo().setEnabled(false);
 			if (orgAllowed) {
 				final SettableFuture<List<HaleConnectOrganisationInfo>> orgsFuture = SettableFuture
@@ -525,6 +540,8 @@ public void run() {
 											orgSelector.setSelection(
 													new StructuredSelection(result.get(0)));
 										}
+
+										updateState();
 									}
 								});
 							}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.haleconnect/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.haleconnect/META-INF/MANIFEST.MF
index 60a940baed..241efd2278 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.haleconnect/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.haleconnect/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale connect integration
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.haleconnect;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.core;bundle-version="3.3.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.html.svg.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.html.svg.test/META-INF/MANIFEST.MF
index 70f03a05e0..4b7101a180 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.html.svg.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.html.svg.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SVG Based HTML Documentation Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.html.svg.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.html.svg;bundle-version="2.8.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.html.svg/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.html.svg/META-INF/MANIFEST.MF
index 82833cd8e3..06ff09c14f 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.html.svg/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.html.svg/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SVG Based HTML Documentation
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.html.svg;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.1.5",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.html.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.html.ui/META-INF/MANIFEST.MF
index 12bbad5a7c..d3b121d1c8 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.html.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.html.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HTML UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.html.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.2",
  org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.html/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.html/META-INF/MANIFEST.MF
index 0ea0216a37..5983733036 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.html/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.html/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HTML I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.html;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="9.0.0",
  com.google.common.io;version="9.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.instancebuilder/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.instancebuilder/META-INF/MANIFEST.MF
index bde1fe34ee..05f54f74b7 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.instancebuilder/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.instancebuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance builder I/O support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.instancebuilder;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.core;bundle-version="3.3.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.interpolation.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.interpolation.ui/META-INF/MANIFEST.MF
index 32cb367537..15074f5c23 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.interpolation.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.interpolation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Interpolation UI Configuration
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.interpolation.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Require-Bundle: org.eclipse.core.runtime,
  eu.esdihumboldt.hale.ui;bundle-version="3.1.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.test/META-INF/MANIFEST.MF
index 16cbb61948..59633d5611 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.msaccess.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.io;version="17.0.0",
  de.fhg.igd.slf4jplus,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.ui/META-INF/MANIFEST.MF
index 208a4c908a..fdf0a900ee 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MS Access UI Configuration
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.msaccess.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.jdbc.ui;bundle-version="2.9.5"
 Automatic-Module-Name: eu.esdihumboldt.hale.io.jdbc.msaccess.ui
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess/META-INF/MANIFEST.MF
index 37ed4e5831..0e0166f00a 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.msaccess/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE MS-Access Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.msaccess;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.io.jdbc.msaccess.internal.Activator
 Require-Bundle: eu.esdihumboldt.hale.io.jdbc;bundle-version="2.9.5",
  eu.esdihumboldt.hale.common.schema;bundle-version="2.9.5",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql.test/META-INF/MANIFEST.MF
index 02bd1d1665..6272baac60 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test for MS SQL feature
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.mssql.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.jdbc.mssql;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.junit;version="4.12.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF
index 433c6d9147..82f94196a1 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.mssql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE MS-SQL Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.mssql;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.io.jdbc.mssql.internal.Activator
 Bundle-Vendor: wetransform GmbH
 Require-Bundle: eu.esdihumboldt.hale.io.jdbc;bundle-version="3.1.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/META-INF/MANIFEST.MF
index a1c6a340e3..9372aba27b 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: PostgreSQL Database Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.postgresql.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.typesafe.config;version="1.2.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/MultiDimensionalArraysIT.groovy b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/MultiDimensionalArraysIT.groovy
index 8c9daeff00..1d09504808 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/MultiDimensionalArraysIT.groovy
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/MultiDimensionalArraysIT.groovy
@@ -20,8 +20,6 @@ import static org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 
-import ru.yandex.qatools.allure.annotations.Features
-import ru.yandex.qatools.allure.annotations.Stories
 import eu.esdihumboldt.hale.common.instance.groovy.InstanceBuilder
 import eu.esdihumboldt.hale.common.instance.model.InstanceCollection
 import eu.esdihumboldt.hale.common.schema.model.DefinitionUtil
@@ -30,6 +28,8 @@ import eu.esdihumboldt.hale.common.schema.model.TypeDefinition
 import eu.esdihumboldt.hale.common.schema.model.constraint.property.Cardinality
 import eu.esdihumboldt.hale.io.jdbc.test.AbstractDBTest
 import groovy.sql.Sql
+import ru.yandex.qatools.allure.annotations.Features
+import ru.yandex.qatools.allure.annotations.Stories
 
 /**
  * Tests for multi-dimensional arrays. Also documents the current state of support.
@@ -80,13 +80,18 @@ class MultiDimensionalArraysIT extends AbstractDBTest {
 			BIGSERIAL: Long.class, //
 			INT4: Integer.class, //
 			_INT4: Integer.class, // XXX currently array as multi-occurrence property
+			INT8: Long.class, //
+			_INT8: Long.class, //
 			BOOL: Boolean.class, //
 			DECIMAL: BigDecimal.class, //
 			NUMERIC: BigDecimal.class, //
 			VARCHAR: String.class, //
 			_VARCHAR: String.class, // XXX currently array as multi-occurrence property
 			TEXT: String.class, //
+			NAME: String.class, //
 			FLOAT8: Double.class, //
+			TIMESTAMP: java.sql.Timestamp.class, //
+			TIMESTAMPTZ: java.sql.Timestamp.class, //
 		]);
 
 		// check cardinalities
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/OneDimensionalArraysIT.groovy b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/OneDimensionalArraysIT.groovy
index 7067d5fd2a..6245f7ff9e 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/OneDimensionalArraysIT.groovy
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/OneDimensionalArraysIT.groovy
@@ -20,8 +20,6 @@ import static org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 
-import ru.yandex.qatools.allure.annotations.Features
-import ru.yandex.qatools.allure.annotations.Stories
 import eu.esdihumboldt.hale.common.instance.groovy.InstanceBuilder
 import eu.esdihumboldt.hale.common.instance.model.InstanceCollection
 import eu.esdihumboldt.hale.common.schema.model.DefinitionUtil
@@ -30,6 +28,8 @@ import eu.esdihumboldt.hale.common.schema.model.TypeDefinition
 import eu.esdihumboldt.hale.common.schema.model.constraint.property.Cardinality
 import eu.esdihumboldt.hale.io.jdbc.test.AbstractDBTest
 import groovy.sql.Sql
+import ru.yandex.qatools.allure.annotations.Features
+import ru.yandex.qatools.allure.annotations.Stories
 
 /**
  * Tests for one dimensional arrays.
@@ -82,6 +82,8 @@ class OneDimensionalArraysIT extends AbstractDBTest {
 			BIGSERIAL: Long.class, //
 			INT4: Integer.class, //
 			_INT4: Integer.class, // Array as multi-occurrence property
+			INT8: Long.class, //
+			_INT8: Long.class, //
 			BOOL: Boolean.class, //
 			_BOOL: Boolean.class, // Array as multi-occurrence property
 			DECIMAL: BigDecimal.class, //
@@ -91,7 +93,10 @@ class OneDimensionalArraysIT extends AbstractDBTest {
 			VARCHAR: String.class, //
 			_VARCHAR: String.class, // Array as multi-occurrence property
 			TEXT: String.class, //
+			NAME: String.class, //
 			FLOAT8: Double.class, //
+			TIMESTAMP: java.sql.Timestamp.class, //
+			TIMESTAMPTZ: java.sql.Timestamp.class, //
 		]);
 
 		// check cardinalities
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/PostDataTypesIT.groovy b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/PostDataTypesIT.groovy
index 0a398a93b2..0e2542497d 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/PostDataTypesIT.groovy
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/eu/esdihumboldt/hale/io/jdbc/postgresql/test/PostDataTypesIT.groovy
@@ -21,10 +21,6 @@ import java.sql.Date
 import java.sql.Timestamp
 
 import org.junit.Test
-
-import ru.yandex.qatools.allure.annotations.Features
-import ru.yandex.qatools.allure.annotations.Stories
-
 import org.locationtech.jts.geom.Coordinate
 import org.locationtech.jts.geom.Geometry
 import org.locationtech.jts.geom.GeometryFactory
@@ -41,6 +37,8 @@ import eu.esdihumboldt.hale.common.schema.model.Schema
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition
 import eu.esdihumboldt.hale.io.jdbc.test.AbstractDBTest
 import groovy.sql.Sql
+import ru.yandex.qatools.allure.annotations.Features
+import ru.yandex.qatools.allure.annotations.Stories
 
 
 /**
@@ -188,9 +186,11 @@ public class PostDataTypesIT extends AbstractDBTest {
 		m.put("BOOL", Boolean.class);
 		// m.put("BOOLEAN", Boolean.class);
 		m.put("TIMESTAMP", java.sql.Timestamp.class);
+		m.put("TIMESTAMPTZ", java.sql.Timestamp.class);
 		m.put("DATE", java.sql.Date.class);
 		m.put("VARCHAR", java.lang.String.class);
 		m.put("TEXT", java.lang.String.class);
+		m.put("NAME", java.lang.String.class);
 		m.put("NUMERIC", BigDecimal.class);
 		m.put("DECIMAL", BigDecimal.class);
 		m.put("GEOMETRY", GeometryProperty.class);
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/hale-docker.conf b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/hale-docker.conf
index 16fa87ecaf..21dedfada8 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/hale-docker.conf
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql.test/src/hale-docker.conf
@@ -1,4 +1,4 @@
-postgis {
+postgis-latest {
     user="docker"
     password="docker"
     database="gis"
@@ -7,4 +7,15 @@ postgis {
     dockerImage= "kartoza/postgis"
     dbUPTime = 240
     port=5432
-}
\ No newline at end of file
+}
+
+postgis {
+    user="docker"
+    password="docker"
+    database="gis"
+    startURL="jdbc:postgresql://"
+    dockerHost="http://127.0.0.1:2375"
+    dockerImage= "kartoza/postgis:12.4"
+    dbUPTime = 240
+    port=5432
+}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF
index 4e36dfe283..a28dad0912 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.postgresql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE PostgreSQL Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.postgresql;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.io.jdbc.postgresql.internal.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite.test/META-INF/MANIFEST.MF
index 3c44599ba7..d9d0f80930 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SpatiaLite Database Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.spatialite.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.jdbc.spatialite;bundle-version="2.9.1"
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF
index eb6390895d..227afa3c51 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE SpatiaLite Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.spatialite;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.io.jdbc.spatialite.internal.Activator
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteInstanceReader.java b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteInstanceReader.java
index 8c2eaaecbe..720cdb13aa 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteInstanceReader.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteInstanceReader.java
@@ -16,11 +16,15 @@
 package eu.esdihumboldt.hale.io.jdbc.spatialite.reader.internal;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 
+import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
+import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
 import eu.esdihumboldt.hale.common.core.io.Value;
+import eu.esdihumboldt.hale.common.core.io.report.IOReport;
 import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier;
 import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
 import eu.esdihumboldt.hale.common.instance.io.util.InstanceReaderDecorator;
@@ -77,4 +81,17 @@ public void setSource(LocatableInputSupplier<? extends InputStream> source) {
 		internalProvider.setSource(new SpatiaLiteJdbcIOSupplier(new File(source.getLocation())));
 	}
 
+	/**
+	 * @see eu.esdihumboldt.hale.common.core.io.ImportProvider#execute(eu.esdihumboldt.hale.common.core.io.ProgressIndicator,
+	 *      java.lang.String)
+	 */
+	@Override
+	public IOReport execute(ProgressIndicator progress, String resourceIdentifier)
+			throws IOProviderConfigurationException, IOException, UnsupportedOperationException {
+		// for now loading multiple instances from SpatiaLite DB is not
+		// supported.
+		throw new UnsupportedOperationException(
+				"The operation is not supported for SpatiaLite DB multiple files!");
+	}
+
 }
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteSchemaReader.java b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteSchemaReader.java
index 2f574c279b..a84f7ef5f2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteSchemaReader.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.spatialite/src/eu/esdihumboldt/hale/io/jdbc/spatialite/reader/internal/SpatiaLiteSchemaReader.java
@@ -16,11 +16,15 @@
 package eu.esdihumboldt.hale.io.jdbc.spatialite.reader.internal;
 
 import java.io.File;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
 
+import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
+import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
 import eu.esdihumboldt.hale.common.core.io.Value;
+import eu.esdihumboldt.hale.common.core.io.report.IOReport;
 import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier;
 import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
 import eu.esdihumboldt.hale.common.schema.io.util.SchemaReaderDecorator;
@@ -76,4 +80,16 @@ public void setSource(LocatableInputSupplier<? extends InputStream> source) {
 		this.source = source;
 		internalProvider.setSource(new SpatiaLiteJdbcIOSupplier(new File(source.getLocation())));
 	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.common.core.io.IOProvider#execute(eu.esdihumboldt.hale.common.core.io.ProgressIndicator,
+	 *      java.lang.String)
+	 */
+	@Override
+	public IOReport execute(ProgressIndicator progress, String resourceIdentifier)
+			throws IOProviderConfigurationException, IOException, UnsupportedOperationException {
+		// for now loading multiple schemas from SpatiaLite DB is not supported.
+		throw new UnsupportedOperationException(
+				"The operation is not supported for SpatiaLite DB multiple files!");
+	}
 }
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/META-INF/MANIFEST.MF
index 4737ea01e0..da21547572 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  eu.esdihumboldt.hale.io.jdbc;bundle-version="2.9.0",
  eu.esdihumboldt.hale.common.schema;bundle-version="2.9.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/src/eu/esdihumboldt/hale/io/jdbc/test/AbstractDBTest.java b/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/src/eu/esdihumboldt/hale/io/jdbc/test/AbstractDBTest.java
index 79ea208254..28d0bdff84 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/src/eu/esdihumboldt/hale/io/jdbc/test/AbstractDBTest.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.test/src/eu/esdihumboldt/hale/io/jdbc/test/AbstractDBTest.java
@@ -286,7 +286,8 @@ protected void checkBindingAndSqlType(Schema schema, Map<String, Class<?>> map)
 				// check bindings for those data type for which expected binding
 				// is mapped.
 				if (map.containsKey(name))
-					assertEquals(map.get(name), k.getBinding());
+					assertEquals("Binding mismatch for type \"" + name + "\"", map.get(name),
+							k.getBinding());
 				else
 					fail(MessageFormat.format(
 							"No expected binding specified for type {0} (SQL type {1}) - binding is {2}",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc.ui/META-INF/MANIFEST.MF
index a545e8b086..c09d0f5104 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE JDBC Support UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui;bundle-version="3.7.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF
index 55bf439c48..166095f0b4 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.jdbc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE JDBC Schema and Instance Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.jdbc;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-BuddyPolicy: registered
 Require-Bundle: eu.esdihumboldt.hale.common.schema;bundle-version="2.5.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.json.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.json.test/META-INF/MANIFEST.MF
index 77fb044b24..08d2405288 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.json.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.json.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Json I/O tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.json.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.json;bundle-version="2.9.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.json.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.json.ui/META-INF/MANIFEST.MF
index d4bf76985e..a9558f6b3c 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.json.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.json.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JSON Export UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.json.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF
index ab5a3c565a..5d563f5b97 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.json/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Json IO
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.json;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="1.6.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.oml.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.oml.test/META-INF/MANIFEST.MF
index 609e30dfaf..da3dd622d6 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.oml.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.oml.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OML Test Bundle
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.oml.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="1.0.0",
  edu.umd.cs.findbugs.annotations,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF
index bf694c4842..e5de3f4428 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.oml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OML Alignment I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.oml;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.io;version="9.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.project.jaxb/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.project.jaxb/META-INF/MANIFEST.MF
index 31d8f65bdb..f3cd443ccf 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.project.jaxb/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.project.jaxb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Support for legacy HALE projects based on JAXB
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.project.jaxb;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
  de.fhg.igd.slf4jplus,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.schemabuilder/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.schemabuilder/META-INF/MANIFEST.MF
index 55fecf3309..b47563a16f 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.schemabuilder/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.schemabuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schemabuilder I/O support
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.schemabuilder;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.schema.groovy;bundle-version="3.3.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.schematron.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.schematron.test/META-INF/MANIFEST.MF
index 2240bfcba7..f8fd998e10 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.schematron.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.schematron.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schematron Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.schematron.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.schematron;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.junit;version="4.12.0"
diff --git a/io/plugins/eu.esdihumboldt.hale.io.schematron.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.schematron.ui/META-INF/MANIFEST.MF
index e4b668495d..42c1116e30 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.schematron.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.schematron.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schematron Validator UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.schematron.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.schematron/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.schematron/META-INF/MANIFEST.MF
index 320605d8ac..fdf944ce84 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.schematron/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.schematron/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Schematron Validator
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.schematron;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.contenttype;bundle-version="3.5.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.classpath b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.classpath
similarity index 63%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver/.classpath
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.classpath
index eca7bdba8f..e2163cd8a2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.classpath
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.classpath
@@ -2,6 +2,11 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="GROOVY_DSL_SUPPORT"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.project b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.project
similarity index 85%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver/.project
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.project
index 7747f0e514..5f990f9be3 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.project
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eu.esdihumboldt.hale.io.xtraserver</name>
+	<name>eu.esdihumboldt.hale.io.shp.test</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,6 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.groovy.core.groovyNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/edu.umd.cs.findbugs.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/edu.umd.cs.findbugs.core.prefs
similarity index 98%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/edu.umd.cs.findbugs.core.prefs
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/edu.umd.cs.findbugs.core.prefs
index c0ebfd4e30..e15d3fde8a 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
-#Created from default preferences 13-mag-2015 11.02.50
-#Wed May 13 11:02:50 CEST 2015
+#Created from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
 cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud
 detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
 detectorAtomicityProblem=AtomicityProblem|true
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.core.resources.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000000..06e7a30209
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+#Created from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.core.prefs
similarity index 99%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.core.prefs
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.core.prefs
index 479fbdc7a6..2f639b46de 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.core.prefs
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,5 +1,5 @@
-#Updated from default preferences Apr 25, 2017 3:25:14 PM
-#Tue Apr 25 15:25:14 CEST 2017
+#Updated from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
 eclipse.preferences.version=1
 org.eclipse.jdt.core.builder.cleanOutputFolder=clean
 org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -108,6 +108,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.release=disabled
 org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.launching.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.launching.prefs
similarity index 54%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.launching.prefs
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.launching.prefs
index ed68832e0a..65bc501d0a 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.launching.prefs
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.launching.prefs
@@ -1,4 +1,4 @@
-#Created from default preferences 12-mag-2015 16.01.18
-#Tue May 12 16:01:18 CEST 2015
+#Created from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
 eclipse.preferences.version=1
 org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.ui.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 98%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.ui.prefs
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.ui.prefs
index 46646fbb60..de1d0ac067 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.jdt.ui.prefs
@@ -1,5 +1,5 @@
-#Updated from default preferences Jul 9, 2016 10:07:16 AM
-#Sat Jul 09 10:07:16 CEST 2016
+#Created from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
 formatter_profile=_HALE
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.prefs b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.prefs
similarity index 92%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.prefs
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.prefs
index fae5965fb0..7d6bba1e85 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.prefs
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/.settings/org.eclipse.pde.prefs
@@ -1,5 +1,5 @@
-#Created from default preferences Jul 25, 2018 1:58:36 PM
-#Wed Jul 25 13:58:36 CEST 2018
+#Created from default preferences Aug 26, 2021 11:59:08 PM
+#Thu Aug 26 23:59:08 CEST 2021
 compilers.f.unresolved-features=1
 compilers.f.unresolved-plugins=1
 compilers.incompatible-environment=2
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.shp.test/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..60d7e5d013
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/META-INF/MANIFEST.MF
@@ -0,0 +1,21 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Shapefile package Test
+Bundle-SymbolicName: eu.esdihumboldt.hale.io.shp.test
+Bundle-Version: 4.0.0.qualifier
+Fragment-Host: eu.esdihumboldt.hale.io.shp;bundle-version="4.1.0"
+Automatic-Module-Name: eu.esdihumboldt.hale.shp.test
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: wetransform GmbH
+Require-Bundle: groovy;bundle-version="2.4.14",
+ org.junit;bundle-version="4.13.0",
+ org.eclipse.core.runtime;bundle-version="3.17.100",
+ eu.esdihumboldt.hale.common.schema.groovy;bundle-version="4.1.0",
+ eu.esdihumboldt.cst.functions.geometric;bundle-version="4.1.0"
+Import-Package: de.fhg.igd.slf4jplus,
+ eu.esdihumboldt.hale.common.filter,
+ eu.esdihumboldt.hale.common.schema,
+ eu.esdihumboldt.hale.common.test,
+ eu.esdihumboldt.hale.io.gml.reader.internal,
+ eu.esdihumboldt.hale.io.xsd.reader,
+ org.locationtech.jts.geom;version="1.16.0"
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/build.properties b/io/plugins/eu.esdihumboldt.hale.io.shp.test/build.properties
similarity index 100%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/build.properties
rename to io/plugins/eu.esdihumboldt.hale.io.shp.test/build.properties
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/eu/esdihumboldt/hale/io/shp/ShapefileInstanceWriterTest.groovy b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/eu/esdihumboldt/hale/io/shp/ShapefileInstanceWriterTest.groovy
new file mode 100644
index 0000000000..da52305941
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/eu/esdihumboldt/hale/io/shp/ShapefileInstanceWriterTest.groovy
@@ -0,0 +1,1274 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.io.shp
+
+import static org.junit.Assert.assertEquals
+import static org.junit.Assert.assertFalse
+import static org.junit.Assert.assertTrue
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.time.Instant
+import java.time.LocalDate
+import java.util.function.Consumer
+
+import org.junit.Test
+import org.locationtech.jts.geom.Coordinate
+import org.locationtech.jts.geom.Geometry
+import org.locationtech.jts.geom.GeometryFactory
+import org.locationtech.jts.geom.MultiPolygon
+import org.locationtech.jts.geom.Point
+
+import eu.esdihumboldt.cst.functions.geometric.GeometryHelperFunctions
+import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException
+import eu.esdihumboldt.hale.common.core.io.impl.LogProgressIndicator
+import eu.esdihumboldt.hale.common.core.io.report.IOReport
+import eu.esdihumboldt.hale.common.core.io.supplier.DefaultInputSupplier
+import eu.esdihumboldt.hale.common.core.io.supplier.FileIOSupplier
+import eu.esdihumboldt.hale.common.instance.geometry.DefaultGeometryProperty
+import eu.esdihumboldt.hale.common.instance.geometry.impl.CodeDefinition
+import eu.esdihumboldt.hale.common.instance.groovy.InstanceBuilder
+import eu.esdihumboldt.hale.common.instance.model.Instance
+import eu.esdihumboldt.hale.common.instance.model.InstanceCollection
+import eu.esdihumboldt.hale.common.schema.SchemaSpaceID
+import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty
+import eu.esdihumboldt.hale.common.schema.groovy.SchemaBuilder
+import eu.esdihumboldt.hale.common.schema.model.Schema
+import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace
+import eu.esdihumboldt.hale.io.shp.reader.internal.ShapeInstanceReader
+import eu.esdihumboldt.hale.io.shp.reader.internal.ShapeSchemaReader
+import eu.esdihumboldt.hale.io.shp.writer.ShapefileInstanceWriter
+import groovy.transform.CompileStatic
+
+class ShapefileInstanceWriterTest {
+
+	static GeometryProperty<? extends Geometry> createGeometry(String wkt, Object crs) {
+		return GeometryHelperFunctions._with([geometry: wkt, crs: crs])
+	}
+
+
+	@CompileStatic
+	public static Schema loadSchema(File file)
+	throws IOProviderConfigurationException, IOException {
+		ShapeSchemaReader reader = new ShapeSchemaReader();
+
+		reader.setSchemaSpace(SchemaSpaceID.SOURCE);
+		reader.setSource(new FileIOSupplier(file));
+
+		IOReport report = reader.execute(new LogProgressIndicator());
+
+		assertTrue(report.isSuccess());
+		assertTrue(report.getErrors().isEmpty());
+
+		return reader.getSchema();
+	}
+
+	@CompileStatic
+	static InstanceCollection loadInstances(File file) {
+		Schema schema = loadSchema(file)
+
+		ShapeInstanceReader reader = new ShapeInstanceReader()
+
+		reader.setSource(new FileIOSupplier(file))
+		reader.setSourceSchema(schema)
+
+		IOReport report = reader.execute(new LogProgressIndicator())
+
+		assertTrue(report.isSuccess())
+		assertTrue(report.getErrors().isEmpty())
+
+		return reader.getInstances();
+	}
+
+	@CompileStatic
+	static InstanceCollection loadInstances(File file, String additionalName) {
+		URI location = file.toURI()
+		String filePath = Paths.get(location).getParent().toString();
+		String filenameOnly = Paths.get(location).getFileName().toString();
+
+		filenameOnly = filenameOnly.substring(0, filenameOnly.lastIndexOf("."));
+		String filename = filePath + "/" + filenameOnly + "_" + additionalName + ".shp";
+		file = new File(filename)
+		Schema schema = loadSchema(file)
+
+		ShapeInstanceReader reader = new ShapeInstanceReader()
+
+		reader.setSource(new FileIOSupplier(file))
+		reader.setSourceSchema(schema)
+
+		IOReport report = reader.execute(new LogProgressIndicator())
+
+		assertTrue(report.isSuccess())
+		assertTrue(report.getErrors().isEmpty())
+
+		return reader.getInstances();
+	}
+
+
+	/**
+	 * Write an instance collection to a Shapefile.
+	 */
+	@CompileStatic
+	static IOReport writeInstances(File file, Schema schema, InstanceCollection instances,
+			Consumer<ShapefileInstanceWriter> configurator = null) {
+
+		ShapefileInstanceWriter writer = new ShapefileInstanceWriter();
+
+		writer.setTarget(new FileIOSupplier(file))
+		def ss = new DefaultSchemaSpace()
+		ss.addSchema(schema)
+		writer.setTargetSchema(ss)
+		writer.setInstances(instances)
+
+		if (configurator != null) {
+			configurator.accept(writer)
+		}
+
+		IOReport report = writer.execute(new LogProgressIndicator())
+
+		assertTrue(report.isSuccess())
+		assertTrue(report.getErrors().isEmpty())
+
+		return report;
+	}
+
+	/**
+	 * Write an instance collection to a Shapefile.
+	 */
+	@CompileStatic
+	static IOReport writeInstancesWithReporterErrors(File file, Schema schema, InstanceCollection instances,
+			Consumer<ShapefileInstanceWriter> configurator = null) {
+
+		ShapefileInstanceWriter writer = new ShapefileInstanceWriter();
+
+		writer.setTarget(new FileIOSupplier(file))
+		def ss = new DefaultSchemaSpace()
+		ss.addSchema(schema)
+		writer.setTargetSchema(ss)
+		writer.setInstances(instances)
+
+		if (configurator != null) {
+			configurator.accept(writer)
+		}
+
+		IOReport report = writer.execute(new LogProgressIndicator())
+
+		assertTrue(report.isSuccess())
+		assertFalse(report.getErrors().isEmpty())
+
+		return report;
+	}
+
+
+
+	@CompileStatic
+	static void withNewShapefile(Schema schema, InstanceCollection instances, Consumer<File> handler,
+			Consumer<ShapefileInstanceWriter> configurator = null) {
+		Path tmpDir = Files.createTempDirectory("ShapefileTest")
+		Path tmpFile = Files.createTempFile(tmpDir,'new', '.shp')
+
+		try {
+			println "Temporary file is $tmpFile"
+			writeInstances(tmpFile.toFile(), schema, instances, configurator)
+			handler.accept(tmpFile.toFile())
+		} finally {
+			tmpDir.deleteDir()
+		}
+	}
+
+	@CompileStatic
+	static void withNewShapefileWithReporterErrors(Schema schema, InstanceCollection instances, Consumer<File> handler,
+			Consumer<ShapefileInstanceWriter> configurator = null) {
+		Path tmpDir = Files.createTempDirectory("ShapefileTest")
+		Path tmpFile = Files.createTempFile(tmpDir,'new', '.shp')
+
+		try {
+			println "Temporary file is $tmpFile"
+			writeInstancesWithReporterErrors(tmpFile.toFile(), schema, instances, configurator)
+			handler.accept(tmpFile.toFile())
+		} finally {
+			tmpDir.deleteDir()
+		}
+	}
+
+	@Test
+	public void simpleSchemaWriteTest() throws Exception {
+		ShapeSchemaReader schemaReader = new ShapeSchemaReader();
+		schemaReader.setSource(new DefaultInputSupplier(getClass().getResource(
+				"/testdata/GN_Point/GN_Point.shp").toURI()));
+
+		schemaReader.validate();
+		IOReport report = schemaReader.execute(null);
+		assertTrue(report.isSuccess());
+
+		Schema schema = schemaReader.getSchema();
+
+		ShapeInstanceReader instanceReader = new ShapeInstanceReader();
+		instanceReader.setSource(new DefaultInputSupplier(getClass().getResource(
+				"/testdata/GN_Point/GN_Point.shp").toURI()));
+		instanceReader.setSourceSchema(schema);
+
+		instanceReader.validate();
+		report = instanceReader.execute(null);
+		assertTrue(report.isSuccess());
+
+		InstanceCollection instances = instanceReader.getInstances();
+
+		assertFalse(instances.isEmpty());
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+				}
+			}
+			// 593 instances were loaded
+			assertEquals(593, num)
+		}
+	}
+
+
+
+	@Test
+	void testSingleGeometry() {
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( createGeometry('POINT(48.137222 11.575556)', 4326) )
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+					def crs = the_geom.getCRSDefinition()
+					assert crs
+					def jts = the_geom.geometry
+					assert jts instanceof Point
+					def name = inst.p.name.value()
+					assert name
+					switch (name) {
+						case 'Darmstadt':
+							assert inst.p.populati.value() == 158254
+							break
+						case 'München':
+							assert inst.p.populati.value() == 1471508
+							break
+						default:
+							throw new IllegalStateException("Unexpected type $typeName")
+					}
+				}
+			}
+			assertEquals(2, num)
+		}
+
+	}
+
+	@Test
+	void testSinglePolyGeometry() {
+
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location(polyGeom)
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( polyGeom)
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+					def crs = the_geom.getCRSDefinition()
+					assert crs
+					def jts = the_geom.geometry
+
+					assert jts instanceof MultiPolygon
+					def name = inst.p.name.value()
+					assert name
+					switch (name) {
+						case 'Darmstadt':
+							assert inst.p.populati.value() == 158254
+							break
+						case 'München':
+							assert inst.p.populati.value() == 1471508
+							break
+						default:
+							throw new IllegalStateException("Unexpected type $typeName")
+					}
+				}
+			}
+			assertEquals(2, num)
+		}
+
+	}
+
+	@Test
+	void testWriteMultipleGeometries() {
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+				loc(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+				loc(polyGeom )
+			}
+
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def geomNames = ["Point", "Polygon"]
+			//				def loaded = loadInstances(file)
+			int num = 0
+			for (geom in geomNames) {
+				def loaded = loadInstances(file, geom)
+
+				loaded.iterator().withCloseable {
+					while (it.hasNext()) {
+						Instance inst = it.next()
+						num++
+
+						// test instance
+						def typeName = inst.getDefinition().getName().getLocalPart()
+
+						def the_geom = inst.p.the_geom.value()
+						assert the_geom
+						assert the_geom instanceof GeometryProperty
+						def crs = the_geom.getCRSDefinition()
+						assert crs
+						def jts = the_geom.geometry
+						assert jts
+						def name = inst.p.name.value()
+						assert name
+						switch (name) {
+							case 'Darmstadt':
+								assert inst.p.populati.value() == 158254
+								break
+							case 'München':
+								assert inst.p.populati.value() == 1471508
+								break
+							default:
+								throw new IllegalStateException("Unexpected type $typeName")
+						}
+					}
+				}
+			}
+			assertEquals(2, num)
+		}
+
+	}
+
+	@Test
+	void testWriteMultiSchemas() {
+		Schema schema = new SchemaBuilder().schema {
+			attr1 {
+				col1()
+				col2()
+				location(GeometryProperty)
+			}
+			abc {
+				a(String)
+				b(Double)
+				c(Long)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			attr1 {
+				col1('Value 1')
+				col2('Value 2')
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			abc {
+				a('Text')
+				b(3.14)
+				c(42)
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+			}
+
+			abc {
+				a('More text')
+				b(1.52)
+				c(23)
+				location(createGeometry('POINT(48.137222 11.575556)', 4326))
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def schemaNames = ["attr1", "abc"]
+			int num = 0
+			int abcCount = 0
+			int attrCount = 0
+			for (schemaName in schemaNames) {
+				def loaded = loadInstances(file, schemaName)
+				loaded.iterator().withCloseable {
+					while (it.hasNext()) {
+						Instance inst = it.next()
+						num++
+
+						// test instance
+						def typeName = inst.getDefinition().getName().getLocalPart()
+
+						if(typeName.contains("attr1")) {
+							attrCount++
+							assert inst.p.col1.value() == 'Value 1'
+							assert inst.p.col2.value() == 'Value 2'
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+						else if(typeName.contains("abc")) {
+							abcCount++
+							assert inst.p.a.value() instanceof String
+							assert inst.p.b.value() instanceof Double
+							assert inst.p.c.value() instanceof Long
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+					}
+				}
+
+
+			}
+			assertEquals(3, num)
+			assertEquals(2, abcCount)
+			assertEquals(1, attrCount)
+		}
+	}
+
+	@Test
+	void testWriteBigNumbers() {
+		Schema schema = new SchemaBuilder().schema {
+			abc {
+				a(BigInteger)
+				b(BigDecimal)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			abc {
+				a(new BigInteger('123'))
+				b(new BigDecimal('1.23'))
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+			}
+
+			abc {
+				// Expectation: 776627963145224191
+				a(new BigInteger('1' + Long.MAX_VALUE))
+				// Expectation in Double: 1.09849107197545958E18
+				b(new BigDecimal('1098491071975459529.6201509049614540479'))
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def loaded = loadInstances(file)
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					assert inst.p.a.value() instanceof Long
+					assert inst.p.b.value() instanceof Double
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+				}
+			}
+
+			// two instances were loaded
+			assertEquals(2, num)
+		}
+	}
+	//test case for multiple schema for multiple geometries.
+	@Test
+	void testWriteMultiSchemasWithMultiGeom() {
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			attr1 {
+				col1()
+				col2()
+				location(GeometryProperty)
+				loc(GeometryProperty)
+			}
+			abc {
+				a(String)
+				b(Double)
+				c(Long)
+				location(GeometryProperty)
+				locat(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			attr1 {
+				col1('Value 1')
+				col2('Value 2')
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+				loc(polyGeom)
+			}
+
+			abc {
+				a('Text')
+				b(3.14)
+				c(42)
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+				locat(polyGeom)
+			}
+
+			abc {
+				a('More text')
+				b(1.52)
+				c(23)
+				location(createGeometry('POINT(48.137222 11.575556)', 4326))
+				locat(polyGeom)
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def schemaNames = [
+				"attr1_Point",
+				"attr1_Polygon",
+				"abc_Point",
+				"abc_Polygon"
+			]
+			int num = 0
+			int abcCount = 0
+			int attrCount = 0
+			for (schemaName in schemaNames) {
+				def loaded = loadInstances(file, schemaName)
+				loaded.iterator().withCloseable {
+					while (it.hasNext()) {
+						Instance inst = it.next()
+						num++
+
+						// test instance
+						def typeName = inst.getDefinition().getName().getLocalPart()
+						if(typeName.contains("attr1")) {
+							attrCount++
+							assert inst.p.col1.value() == 'Value 1'
+							assert inst.p.col2.value() == 'Value 2'
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+						else if(typeName.contains("abc")) {
+							abcCount++
+							assert inst.p.a.value() instanceof String
+							assert inst.p.b.value() instanceof Double
+							assert inst.p.c.value() instanceof Long
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+					}
+				}
+
+
+			}
+			assertEquals(6, num)
+			assertEquals(4, abcCount)
+			assertEquals(2, attrCount)
+		}
+	}
+
+
+	//test case for multiple schema for multiple geometries with one schema missing the geometry property.
+	@Test
+	void testWriteSingleCorrectSchemasWithOneMissingGeom() {
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+
+		Schema schema = new SchemaBuilder().schema {
+			attr1 {
+				col1()
+				col2()
+			}
+			abc {
+				a(String)
+				b(Double)
+				c(Long)
+				location(GeometryProperty)
+				locat(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			attr1 {
+				col1('Value 1')
+				col2('Value 2')
+			}
+
+			abc {
+				a('Text')
+				b(3.14)
+				c(42)
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+				locat(polyGeom)
+			}
+
+			abc {
+				a('More text')
+				b(1.52)
+				c(23)
+				location(createGeometry('POINT(48.137222 11.575556)', 4326))
+				locat(polyGeom)
+			}
+		}
+
+		withNewShapefileWithReporterErrors(schema, instances) { file ->
+			// load instances again and test
+			def schemaNames = ["Point", "Polygon"]
+			int num = 0
+			int abcCount = 0
+			int attrCount = 0
+			for (schemaName in schemaNames) {
+				def loaded = loadInstances(file, schemaName)
+				loaded.iterator().withCloseable {
+					while (it.hasNext()) {
+						Instance inst = it.next()
+						num++
+
+						// test instance
+						def typeName = inst.getDefinition().getName().getLocalPart()
+						abcCount++
+						assert inst.p.a.value() instanceof String
+						assert inst.p.b.value() instanceof Double
+						assert inst.p.c.value() instanceof Long
+						def the_geom = inst.p.the_geom.value()
+						assert the_geom
+						assert the_geom instanceof GeometryProperty
+					}
+				}
+
+
+			}
+			assertEquals(4, num)
+			assertEquals(4, abcCount)
+			//			assertEquals(2, attrCount)
+		}
+	}
+
+	@Test
+	void testWriteMultiSchemasWithOneMissingGeom() {
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			attr1 {
+				col1()
+				col2()
+			}
+			abc {
+				a(String)
+				b(Double)
+				c(Long)
+				location(GeometryProperty)
+				locat(GeometryProperty)
+			}
+			xyz {
+				a(String)
+				place(GeometryProperty)
+				geom(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			attr1 {
+				col1('Value 1')
+				col2('Value 2')
+			}
+
+			attr1 {
+				col1('Value 1')
+				col2('Value 2')
+			}
+
+			abc {
+				a('Text')
+				b(3.14)
+				c(42)
+				location( createGeometry('POINT(49.872833 8.651222)', 4326))
+				locat(polyGeom)
+			}
+
+			abc {
+				a('More text')
+				b(1.52)
+				c(23)
+				location(createGeometry('POINT(48.137222 11.575556)', 4326))
+				locat(polyGeom)
+			}
+
+			xyz {
+				a('Text1')
+				place( createGeometry('POINT(49.872833 8.651222)', 4326))
+				geom(polyGeom)
+			}
+
+			xyz {
+				a('Text1')
+				place(createGeometry('POINT(48.137222 11.575556)', 4326))
+				geom(polyGeom)
+			}
+		}
+
+		withNewShapefileWithReporterErrors(schema, instances) { file ->
+			// load instances again and test
+			def schemaNames = [
+				"abc_Point",
+				"abc_Polygon",
+				"xyz_Point",
+				"xyz_Polygon"
+			]
+			int num = 0
+			int abcCount = 0
+			int xyzCount = 0
+			for (schemaName in schemaNames) {
+				def loaded = loadInstances(file, schemaName)
+				loaded.iterator().withCloseable {
+					while (it.hasNext()) {
+						Instance inst = it.next()
+						num++
+
+						// test instance
+						def typeName = inst.getDefinition().getName().getLocalPart()
+						if(typeName.contains("xyz")) {
+							xyzCount++
+							assert inst.p.a.value() == 'Text1'
+							assert inst.p.a.value() instanceof String
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+						else if(typeName.contains("abc")) {
+							abcCount++
+							assert inst.p.a.value() instanceof String
+							assert inst.p.b.value() instanceof Double
+							assert inst.p.c.value() instanceof Long
+							def the_geom = inst.p.the_geom.value()
+							assert the_geom
+							assert the_geom instanceof GeometryProperty
+						}
+					}
+				}
+
+
+			}
+			assertEquals(8, num)
+			assertEquals(4, xyzCount)
+			assertEquals(4, abcCount)
+			//			assertEquals(2, attrCount)
+		}
+	}
+
+
+	@Test
+	void testWriteReadDateTime() {
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				//				id(Integer)
+				name(String)
+				a_date(LocalDate)
+				a_timestamp(Instant)
+				legacy_date(Date)
+				location(GeometryProperty)
+			}
+		}
+
+		def aDate = LocalDate.of(2017, 10, 3)
+
+		def aTimestamp = Instant.parse('2042-04-02T00:00:42Z')
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				a_date(aDate)
+				a_timestamp(aTimestamp)
+				legacy_date(Date.from(aTimestamp))
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+
+			// load instances again and test
+			def loaded = loadInstances(file)
+
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					def name = inst.p.name.value()
+					assert name
+
+					def a_date = inst.p.a_date.value()
+					assert a_date instanceof String
+					assert a_date == aDate.toString()
+					def a_timestamp = inst.p.a_timestam.value()
+					assert a_timestamp == null
+					def ati = inst.p.ati.value()
+					assert ati != null
+					def legacy_date = inst.p.legacy_dat.value()
+					assert legacy_date == null
+
+					def leda = inst.p.leda.value()
+					assert leda != null
+
+
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+				}
+			}
+
+			// instances were loaded
+			assertEquals(1, num)
+		}
+	}
+
+	@Test
+	void testWriteFeaturesTargetCRS() {
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population 158254
+				location( createGeometry('POINT(49.872833 8.651222)', 4326) )
+			}
+
+			city {
+				name 'München'
+				population 1471508
+				location( createGeometry('POINT(48.137222 11.575556)', 4326) )
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+					//					assert typeName == 'city'
+					def geom = inst.p.the_geom.value()
+					assert geom
+					assert geom instanceof GeometryProperty
+					def crs = geom.getCRSDefinition()
+					assert crs
+					assert crs instanceof CodeDefinition
+					assert crs.code == 'EPSG:25832'
+					def jts = geom.geometry
+					assert jts instanceof Point
+					def name = inst.p.name.value()
+					assert name
+					switch (name) {
+						case 'Darmstadt':
+							assert inst.p.populati.value() == 158254
+							break
+						case 'München':
+							assert inst.p.populati.value() == 1471508
+							break
+						default:
+							throw new IllegalStateException("Unexpected type $typeName")
+					}
+				}
+			}
+
+			// instances were loaded
+			assertEquals(2, num)
+		} { ShapefileInstanceWriter writer ->
+			writer.setTargetCRS(new CodeDefinition('EPSG:25832'))
+		}
+	}
+
+
+	@Test
+	void testSinglePolyGeometryWithLongAttributeNamesWithSingleInstance() {
+
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				nameInCamelCase(String)
+				name_In_snake_CamelCase(String)
+				name_in_snake_case(String)
+				name1234567(String)
+				populaon123456789(Integer)
+				snake_camelCase1234(String)
+				location(GeometryProperty)
+				myprop(String)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darms'
+				nameInCamelCase 'DarmstadtnameInCamelCase'
+				name_In_snake_CamelCase 'Darmstadt name_In_snake_CamelCase'
+				name_in_snake_case 'Darmstadt name_in_snake_case'
+				name1234567 'Darmstadt name1234567'
+				populaon123456789 158254
+				snake_camelCase1234 'snake_camelCase1234'
+				location(polyGeom)
+				myprop 'myprop'
+			}
+
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+					def crs = the_geom.getCRSDefinition()
+					assert crs
+					def jts = the_geom.geometry
+
+					assert jts instanceof MultiPolygon
+
+					def name = inst.p.name.value()
+					assert name == 'Darms'
+					def naInCaCa = inst.p.naInCaCa.value()
+					assert naInCaCa == 'DarmstadtnameInCamelCase'
+					assertEquals('DarmstadtnameInCamelCase',naInCaCa)
+
+					//truncated after 8 so 'Ca' is not in the name.
+					def naInsnCa = inst.p.naInsnCa.value()
+					assertEquals('Darmstadt name_In_snake_CamelCase',naInsnCa)
+
+					def nainsnca = inst.p.nainsnca.value()
+					assertEquals('Darmstadt name_in_snake_case',nainsnca)
+
+					def na12 = inst.p.na12.value()
+					assertEquals('Darmstadt name1234567',na12)
+
+
+					def po12 = inst.p.po12.value()
+					assertEquals(158254,po12)
+
+					def myprop = inst.p.myprop.value()
+					assertEquals('myprop',myprop)
+
+					def sncaCa12 = inst.p.sncaCa12.value()
+					assertEquals('snake_camelCase1234',sncaCa12)
+				}
+			}
+			assertEquals(1, num)
+		}
+	}
+
+
+	@Test
+	void testSinglePolyGeometryWithLongAlphanumericNamesWithMultipleInstances() {
+
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population123(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				population123 158254
+				location(polyGeom)
+			}
+
+			city {
+				name 'München'
+				population123 1471508
+				location( polyGeom)
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+					def crs = the_geom.getCRSDefinition()
+					assert crs
+					def jts = the_geom.geometry
+
+					assert jts instanceof MultiPolygon
+					def name = inst.p.name.value()
+					assert name
+					switch (name) {
+						case 'Darmstadt':
+							assert inst.p.po12.value() == 158254
+							break
+						case 'München':
+							assert inst.p.po12.value() == 1471508
+							break
+						default:
+							throw new IllegalStateException("Unexpected type $typeName")
+					}
+				}
+			}
+			assertEquals(2, num)
+		}
+
+	}
+
+	@Test
+	void testSinglePolyGeometryWithLongAlphanumericNamesWithMultipleInstancesWithMissingData() {
+
+		GeometryFactory gf = new GeometryFactory()
+		def poly = gf.createPolygon([
+			new Coordinate(0, 0),
+			new Coordinate(1, 0),
+			new Coordinate(1, 1),
+			new Coordinate(0, 1),
+			new Coordinate(0, 0)] as Coordinate[])
+		def polyGeom = new DefaultGeometryProperty<Geometry>(new CodeDefinition("EPSG:4326", null), poly)
+
+		Schema schema = new SchemaBuilder().schema {
+			city {
+				name(String)
+				population123(Integer)
+				location(GeometryProperty)
+			}
+		}
+
+		InstanceCollection instances = new InstanceBuilder(types: schema).createCollection {
+			city {
+				name 'Darmstadt'
+				location(polyGeom)
+			}
+
+			city {
+				name 'München'
+				population123 1471508
+				location( polyGeom)
+			}
+		}
+
+		withNewShapefile(schema, instances) { file ->
+			// load instances again and test
+
+			def loaded = loadInstances(file)
+
+			int num = 0
+			loaded.iterator().withCloseable {
+				while (it.hasNext()) {
+					Instance inst = it.next()
+					num++
+
+					// test instance
+					def typeName = inst.getDefinition().getName().getLocalPart()
+
+					def the_geom = inst.p.the_geom.value()
+					assert the_geom
+					assert the_geom instanceof GeometryProperty
+					def crs = the_geom.getCRSDefinition()
+					assert crs
+					def jts = the_geom.geometry
+
+					assert jts instanceof MultiPolygon
+					def name = inst.p.name.value()
+					assert name
+					switch (name) {
+						case 'München':
+							assert inst.p.po12.value() == 1471508
+							break
+					}
+				}
+			}
+			assertEquals(2, num)
+		}
+
+	}
+
+}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.dbf b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.dbf
new file mode 100644
index 0000000000..9fc99641a8
Binary files /dev/null and b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.dbf differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.fix b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.fix
new file mode 100644
index 0000000000..394c1e3b92
Binary files /dev/null and b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.fix differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.prj b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.prj
new file mode 100644
index 0000000000..31a4088423
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.prj
@@ -0,0 +1 @@
+GEOGCS["GRS 1980(IUGG, 1980)",DATUM["D_unknown",SPHEROID["GRS80",6378137,298.257222101]],PRIMEM["Greenwich",0],UNIT["Degree",0.017453292519943295]]
\ No newline at end of file
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.qix b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.qix
new file mode 100644
index 0000000000..041c79573d
Binary files /dev/null and b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.qix differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shp b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shp
new file mode 100644
index 0000000000..a476ab2ad0
Binary files /dev/null and b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shp differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shx b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shx
new file mode 100644
index 0000000000..7f9e3f957c
Binary files /dev/null and b/io/plugins/eu.esdihumboldt.hale.io.shp.test/src/testdata/GN_Point/GN_Point.shx differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/META-INF/MANIFEST.MF
index f2336d0c7c..bf5b75002a 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Shapefile I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.shp.ui;singleton:=true
 Bundle-Vendor: data harmonisation panel
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.io;version="9.0.0",
  eu.esdihumboldt.hale.common.core.io,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/plugin.xml b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/plugin.xml
index 1c5a8ec6e2..1081b9d401 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/plugin.xml
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/plugin.xml
@@ -20,6 +20,13 @@
                ref="eu.esdihumboldt.hale.io.shape.reader.schema">
          </provider>
       </configPage>
+      <configPage
+            class="eu.esdihumboldt.hale.ui.io.config.SimpleTargetCRSConfigurationPage"
+            order="0">
+         <provider
+               ref="eu.esdihumboldt.hale.io.shp.instance.writer">
+         </provider>
+      </configPage>
    </extension>
 
 </plugin>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/src/eu/esdihumboldt/hale/io/shp/ui/TypeSelectionPage.java b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/src/eu/esdihumboldt/hale/io/shp/ui/TypeSelectionPage.java
index 3b70bdb2a2..4586288239 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp.ui/src/eu/esdihumboldt/hale/io/shp/ui/TypeSelectionPage.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp.ui/src/eu/esdihumboldt/hale/io/shp/ui/TypeSelectionPage.java
@@ -17,6 +17,9 @@
 package eu.esdihumboldt.hale.io.shp.ui;
 
 import java.io.InputStream;
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
 
 import javax.xml.namespace.QName;
 
@@ -26,6 +29,8 @@
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -34,6 +39,7 @@
 
 import eu.esdihumboldt.hale.common.core.io.IOProvider;
 import eu.esdihumboldt.hale.common.core.io.Value;
+import eu.esdihumboldt.hale.common.core.io.supplier.FilesIOSupplier;
 import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
 import eu.esdihumboldt.hale.common.instance.io.InstanceReader;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
@@ -64,6 +70,12 @@ public class TypeSelectionPage extends InstanceReaderConfigurationPage
 
 	private Button matchShortPropertyNames;
 
+	/**
+	 * Button to enable auto detection of the schemas. Useful when importing
+	 * multiple source data for multiple schema files.
+	 */
+	private Button autoDetect;
+
 	private Composite page;
 
 	/**
@@ -100,15 +112,82 @@ protected void onShowPage(boolean firstShow) {
 		super.onShowPage(firstShow);
 
 		if (firstShow) {
+			autoDetect = new Button(page, SWT.CHECK);
+			autoDetect.setLayoutData(
+					GridDataFactory.fillDefaults().grab(false, false).span(2, 1).create());
+			autoDetect.setText("Ignore Schema type selection and auto detect types");
+
+			autoDetect.addSelectionListener(new SelectionListener() {
+
+				@Override
+				public void widgetSelected(SelectionEvent e) {
+					if (autoDetect.getSelection()) {
+						setMessage(
+								"All the types will be mapped automatically to their respective file structures.",
+								DialogPage.INFORMATION);
+						selector.setSelection(StructuredSelection.EMPTY);
+						setPageComplete(true);
+					}
+					else {
+						// reset the message in the window asking user to select
+						// schema.
+						setMessage(null);
+						// if user selected just a single file then
+						// automatically select the most compatible file
+						// otherwise set the page to incomplete so that the user
+						// must select a file from the selector.
+						List<URI> locations = getNumberOfSelectedFiles();
+						if (locations.size() == 1) {
+							populateSelector(getWizard().getProvider().getSource());
+						}
+						if (selector.getSelection().isEmpty()) {
+							setPageComplete(false);
+						}
+					}
+					// reload the selector as sometimes in Mac it doesn't
+					// reflect the change.
+					selector.getControl().requestLayout();
+				}
+
+				@Override
+				public void widgetDefaultSelected(SelectionEvent e) {
+					// default selection is false.
+					selector.getControl().setEnabled(true);
+
+				}
+			});
+
+			// add some space
+			new Label(page, SWT.NONE);
+			new Label(page, SWT.NONE);
+
+			Label label = new Label(page, SWT.NONE);
+			label.setText("Schema type:");
 			selector = new TypeDefinitionSelector(page, "Select the corresponding schema type",
 					getWizard().getProvider().getSourceSchema(), null);
 			selector.getControl().setLayoutData(
-					GridDataFactory.fillDefaults().grab(true, false).span(1, 1).create());
+					GridDataFactory.fillDefaults().grab(false, false).span(1, 1).create());
+
 			selector.addSelectionChangedListener(new ISelectionChangedListener() {
 
 				@Override
 				public void selectionChanged(SelectionChangedEvent event) {
+					TypeDefinition selectedObject = selector.getSelectedObject();
+					// user selected None in the dialog box. Reset to default.
+					if (selectedObject == null) {
+						autoDetect.setSelection(true);
+						autoDetect.setEnabled(true);
+						validateSelection();
+						// reload the selector as sometimes in Mac it doesn't
+						// reflect the change.
+						selector.getControl().requestLayout();
+						return;
+					}
+					// otherwise user selected an object so reset the checkbox
+					// to false.
+					autoDetect.setSelection(false);
 					validateSelection();
+					selector.getControl().requestLayout();
 				}
 			});
 
@@ -124,26 +203,77 @@ public void selectionChanged(SelectionChangedEvent event) {
 
 		LocatableInputSupplier<? extends InputStream> currentSource = getWizard().getProvider()
 				.getSource();
-		if (!currentSource.equals(lastSource)) {
+
+		// avoid NPE when relative path check box is selected when loading the
+		// schema.
+		if (currentSource != null && !currentSource.equals(lastSource)) {
 			// if the source has changed
+			populateSelector(currentSource);
+		}
+		setDefaultOptions();
+	}
 
-			lastSource = currentSource;
-			lastType = ShapeSchemaReader.readShapeType(lastSource);
-
-			if (selector.getSelectedObject() == null) {
-				// try to find a candidate for default selection
-				if (lastType != null) {
-					Pair<TypeDefinition, Integer> pt = ShapeInstanceReader
-							.getMostCompatibleShapeType(getWizard().getProvider().getSourceSchema(),
-									lastType, lastType.getName().getLocalPart());
-					if (pt != null) {
-						selector.setSelection(new StructuredSelection(pt.getFirst()));
-					}
+	/**
+	 * Populate selector by default based on the compatibility of the schema and
+	 * the selected data file.
+	 * 
+	 * @param currentSource current selected source.
+	 */
+	private void populateSelector(LocatableInputSupplier<? extends InputStream> currentSource) {
+		lastSource = currentSource;
+		lastType = ShapeSchemaReader.readShapeType(lastSource);
+
+		if (selector.getSelectedObject() == null) {
+			// try to find a candidate for default selection
+			if (lastType != null) {
+				Pair<TypeDefinition, Integer> pt = ShapeInstanceReader.getMostCompatibleShapeType(
+						getWizard().getProvider().getSourceSchema(), lastType,
+						lastType.getName().getLocalPart());
+				if (pt != null) {
+					selector.setSelection(new StructuredSelection(pt.getFirst()));
 				}
 			}
+		}
+
+		validateSelection();
+	}
+
+	/**
+	 * Set default options to the checkbox based on if the user navigated from
+	 * single file import or multiple file import.
+	 */
+	private void setDefaultOptions() {
+		// check how many data files were imported by the user.
+		List<URI> locations = getNumberOfSelectedFiles();
+
+		if (locations != null && locations.size() > 1) {
+			// set auto detect to true as the user navigated from multiple
+			// files selection
+			autoDetect.setSelection(true);
+			selector.setSelection(StructuredSelection.EMPTY);
+		}
+		else {
+			// user navigated from single file selection
+			autoDetect.setSelection(false);
+		}
+	}
 
-			validateSelection();
+	/**
+	 * Method to find the list of selected files.
+	 * 
+	 * @return list of selected files.
+	 */
+	private List<URI> getNumberOfSelectedFiles() {
+		List<URI> locations = null;
+		LocatableInputSupplier<? extends InputStream> currentSource = getWizard().getProvider()
+				.getSource();
+		if (currentSource instanceof FilesIOSupplier) {
+			locations = ((FilesIOSupplier) currentSource).getLocations();
+		}
+		else {
+			locations = Arrays.asList(currentSource.getLocation());
 		}
+		return locations;
 	}
 
 	/**
@@ -180,7 +310,12 @@ protected void validateSelection() {
 			}
 		}
 		else {
-			setMessage(null);
+			setPageComplete(true);
+			setMessage(
+					"All the types will be mapped automatically to their respective file structures.",
+					DialogPage.INFORMATION);
+
+			return;
 		}
 
 		setPageComplete(false);
@@ -211,9 +346,6 @@ protected void createContent(Composite page) {
 		GridData layoutData = new GridData();
 		layoutData.widthHint = 200;
 
-		Label label = new Label(page, SWT.NONE);
-		label.setText("Schema type:");
-
 		setPageComplete(false);
 	}
 
@@ -222,11 +354,19 @@ protected void createContent(Composite page) {
 	 */
 	@Override
 	public boolean updateConfiguration(InstanceReader provider) {
-		if (selector.getSelectedObject() != null) {
-			QName name = selector.getSelectedObject().getName();
-			provider.setParameter(PARAM_TYPENAME, Value.of(name.toString()));
+
+		// make sure if the selection box is empty and autoDetect is checked
+		// then the user should be able to finish the wizard.
+		if ((autoDetect.getSelection() && selector.getSelectedObject() == null)
+				|| selector.getSelectedObject() != null) {
+			if (selector.getSelectedObject() != null) {
+				QName name = selector.getSelectedObject().getName();
+				provider.setParameter(PARAM_TYPENAME, Value.of(name.toString()));
+			}
 			provider.setParameter(PARAM_MATCH_SHORT_PROPERTY_NAMES,
 					Value.of(matchShortPropertyNames.getSelection()));
+			provider.setParameter(PARAM_AUTO_DETECT_SCHEMA_TYPES,
+					Value.of(autoDetect.getSelection()));
 		}
 		else {
 			return false;
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF
index d60d00930d..b88a0489a6 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp/META-INF/MANIFEST.MF
@@ -2,13 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Shapefile Schema/Instance I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.shp;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="15.0.0",
  com.google.common.io;version="17.0.0",
- org.locationtech.jts,
- org.locationtech.jts.geom,
  de.fhg.igd.slf4jplus,
+ eu.esdihumboldt.hale.common.align.model,
+ eu.esdihumboldt.hale.common.align.model.impl,
+ eu.esdihumboldt.hale.common.align.transformation.function,
+ eu.esdihumboldt.hale.common.convert,
  eu.esdihumboldt.hale.common.core.io,
  eu.esdihumboldt.hale.common.core.io.impl,
  eu.esdihumboldt.hale.common.core.io.report,
@@ -18,6 +20,8 @@ Import-Package: com.google.common.collect;version="15.0.0",
  eu.esdihumboldt.hale.common.core.report,
  eu.esdihumboldt.hale.common.instance.geometry,
  eu.esdihumboldt.hale.common.instance.geometry.impl,
+ eu.esdihumboldt.hale.common.instance.groovy,
+ eu.esdihumboldt.hale.common.instance.helper,
  eu.esdihumboldt.hale.common.instance.io,
  eu.esdihumboldt.hale.common.instance.io.impl,
  eu.esdihumboldt.hale.common.instance.model,
@@ -35,13 +39,20 @@ Import-Package: com.google.common.collect;version="15.0.0",
  eu.esdihumboldt.hale.common.schema.persist,
  eu.esdihumboldt.util,
  eu.esdihumboldt.util.io,
+ org.apache.commons.io;version="2.6.0",
  org.eclipse.osgi.util,
- org.slf4j;version="1.5.11"
+ org.locationtech.jts,
+ org.locationtech.jts.geom,
+ org.locationtech.jts.io;version="1.16.0",
+ org.slf4j;version="1.5.11",
+ org.springframework.core.convert;version="3.1.1.RELEASE"
 Require-Bundle: org.geotools;bundle-version="2.6.4",
  org.eclipse.core.contenttype;bundle-version="3.4.100",
- org.opengis;bundle-version="8.0.0"
+ org.opengis;bundle-version="8.0.0",
+ eu.esdihumboldt.hale.common.convert;bundle-version="4.1.0"
 Export-Package: eu.esdihumboldt.hale.io.shp,
  eu.esdihumboldt.hale.io.shp.internal;x-internal:=true,
- eu.esdihumboldt.hale.io.shp.reader.internal;x-internal:=true
+ eu.esdihumboldt.hale.io.shp.reader.internal;x-internal:=true,
+ eu.esdihumboldt.hale.io.shp.writer
 Bundle-Vendor: wetransform GmbH
 Automatic-Module-Name: eu.esdihumboldt.hale.io.shp
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/plugin.xml b/io/plugins/eu.esdihumboldt.hale.io.shp/plugin.xml
index e2f0f32181..a8a26361e9 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp/plugin.xml
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp/plugin.xml
@@ -70,6 +70,30 @@
             </valueDescriptor>
          </providerParameter>
       </provider>
+      <provider
+            allowDuplicate="false"
+            class="eu.esdihumboldt.hale.io.shp.writer.ShapefileInstanceWriter"
+            description="Writes instances to a Shapefile"
+            id="eu.esdihumboldt.hale.io.shp.instance.writer"
+            name="Shapefile writer">
+         <contentType
+               ref="eu.esdihumboldt.hale.io.shp">
+         </contentType>
+         <providerParameter
+               description="Target coordinate reference system the data should be transformed to (only applies if the schema does not specify the CRS already)."
+               label="Target CRS"
+               name="crs"
+               optional="true">
+            <parameterBinding
+                  class="java.lang.String">
+            </parameterBinding>
+            <valueDescriptor
+                  defaultDescription="By default no CRS transformation is performed, the existing geometries are written with their respective CRS."
+                  sample="code:EPSG:4326"
+                  sampleDescription="Reference systems can be defined either as code or WKT (preceded with code: or wkt: respectively)">
+            </valueDescriptor>
+         </providerParameter>
+      </provider>
    </extension>
    <extension
          point="eu.esdihumboldt.hale.io.resource">
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/ShapefileConstants.java b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/ShapefileConstants.java
index 8af54e3172..18f7701281 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/ShapefileConstants.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/ShapefileConstants.java
@@ -57,6 +57,12 @@ public interface ShapefileConstants {
 	 */
 	public static final String PARAM_TYPENAME = "typename";
 
+	/**
+	 * Name of the parameter for {@link ShapeInstanceReader} to auto detect
+	 * schema types when selecting instances for multiple schemas.
+	 */
+	public static final String PARAM_AUTO_DETECT_SCHEMA_TYPES = "autoDetectSchemaTypes";
+
 	/**
 	 * Name of the parameter for {@link ShapeInstanceReader} to activate
 	 * matching of Shapefile property names to schema property names by checking
@@ -65,4 +71,30 @@ public interface ShapefileConstants {
 	 */
 	public static final String PARAM_MATCH_SHORT_PROPERTY_NAMES = "matchShortPropertyNames";
 
+	/**
+	 * Constant for the geometry property for the shape files. Used when
+	 * exporting the data to the shape files.
+	 */
+	public static final String THE_GEOM = "the_geom";
+
+	/**
+	 * Constant for the shape file extension.
+	 */
+	public static final String SHP_EXTENSION = ".shp";
+	/**
+	 * Constant for underscore.
+	 */
+	public static final String UNDERSCORE = "_";
+
+	/**
+	 * Constant for the url. Used to create schema for shape file writer.
+	 */
+	public static final String URL_STRING = "url";
+
+	/**
+	 * Constant used to create default transaction when writing to the shape
+	 * file.
+	 */
+	public static final String CREATE_CONSTANT = "create";
+
 }
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/reader/internal/ShapeInstanceReader.java b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/reader/internal/ShapeInstanceReader.java
index 3b7c906ad8..f81609d239 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/reader/internal/ShapeInstanceReader.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/reader/internal/ShapeInstanceReader.java
@@ -107,24 +107,34 @@ protected IOReport execute(ProgressIndicator progress, IOReporter reporter)
 		progress.setCurrentTask("Extracting shape instances");
 
 		String typename = getParameter(PARAM_TYPENAME).as(String.class);
+
+		// assign default false, otherwise will throw NPE for the test cases.
+		boolean autoDetect = getParameter(PARAM_AUTO_DETECT_SCHEMA_TYPES) != Value.NULL
+				? getParameter(PARAM_AUTO_DETECT_SCHEMA_TYPES).as(Boolean.class)
+				: false;
+
 		TypeDefinition defaultType = null;
-		if (typename != null && !typename.isEmpty()) {
-			try {
-				defaultType = getSourceSchema().getType(QName.valueOf(typename));
-			} catch (Exception e) {
-				// ignore
+//		If the autoDetect is checked then do not get the typename from the TypeSelectionPage.
+		if (!autoDetect) {
+			if (typename != null && !typename.isEmpty()) {
+				try {
+					defaultType = getSourceSchema().getType(QName.valueOf(typename));
+				} catch (Exception e) {
+					// ignore
+				}
 			}
-		}
-		if (defaultType == null) {
-			// check if typename was supplied w/o namespace
-			try {
-				defaultType = getSourceSchema()
-						.getType(new QName(ShapefileConstants.SHAPEFILE_NS, typename));
-			} catch (Exception e) {
-				// ignore
-				// TODO report?
+			if (defaultType == null) {
+				// check if typename was supplied w/o namespace
+				try {
+					defaultType = getSourceSchema()
+							.getType(new QName(ShapefileConstants.SHAPEFILE_NS, typename));
+				} catch (Exception e) {
+					// ignore
+					// TODO report?
+				}
 			}
 		}
+
 		if (defaultType == null) {
 			reporter.info(new IOMessageImpl(
 					"No type name supplied as parameter, trying to auto-detect the schema type.",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/writer/ShapefileInstanceWriter.java b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/writer/ShapefileInstanceWriter.java
new file mode 100644
index 0000000000..4bff73c3cb
--- /dev/null
+++ b/io/plugins/eu.esdihumboldt.hale.io.shp/src/eu/esdihumboldt/hale/io/shp/writer/ShapefileInstanceWriter.java
@@ -0,0 +1,692 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.io.shp.writer;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URI;
+import java.nio.file.FileSystems;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.geotools.data.DefaultTransaction;
+import org.geotools.data.Transaction;
+import org.geotools.data.collection.ListFeatureCollection;
+import org.geotools.data.shapefile.ShapefileDataStore;
+import org.geotools.data.shapefile.ShapefileDataStoreFactory;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureSource;
+import org.geotools.data.simple.SimpleFeatureStore;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
+import org.locationtech.jts.geom.Geometry;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+
+import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
+import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
+import eu.esdihumboldt.hale.common.core.io.report.IOReport;
+import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
+import eu.esdihumboldt.hale.common.core.io.report.impl.IOMessageImpl;
+import eu.esdihumboldt.hale.common.instance.geometry.GeometryFinder;
+import eu.esdihumboldt.hale.common.instance.groovy.InstanceAccessor;
+import eu.esdihumboldt.hale.common.instance.helper.DepthFirstInstanceTraverser;
+import eu.esdihumboldt.hale.common.instance.helper.InstanceTraverser;
+import eu.esdihumboldt.hale.common.instance.io.impl.AbstractGeoInstanceWriter;
+import eu.esdihumboldt.hale.common.instance.model.Instance;
+import eu.esdihumboldt.hale.common.instance.model.InstanceCollection;
+import eu.esdihumboldt.hale.common.instance.model.ResourceIterator;
+import eu.esdihumboldt.hale.common.schema.geometry.CRSDefinition;
+import eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty;
+import eu.esdihumboldt.hale.common.schema.model.DefinitionUtil;
+import eu.esdihumboldt.hale.common.schema.model.PropertyDefinition;
+import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
+import eu.esdihumboldt.hale.common.schema.model.constraint.type.AugmentedValueFlag;
+import eu.esdihumboldt.hale.common.schema.model.constraint.type.Binding;
+import eu.esdihumboldt.hale.common.schema.model.constraint.type.GeometryType;
+import eu.esdihumboldt.hale.common.schema.model.constraint.type.HasValueFlag;
+import eu.esdihumboldt.hale.io.shp.ShapefileConstants;
+
+/**
+ * Class to write features into shape files.
+ * 
+ * @author Kapil Agnihotri
+ */
+public class ShapefileInstanceWriter extends AbstractGeoInstanceWriter {
+
+	/**
+	 * The identifier of the writer as registered to the I/O provider extension.
+	 */
+	public static final String ID = "eu.esdihumboldt.hale.io.shp.instance.writer";
+
+	/**
+	 * Regular expression to split the camelCase, the snake_case, or the
+	 * alphanumeric string.
+	 */
+	private final String REGEX = "(?<!(^|[A-Z]))(?=[A-Z])|(?<!^)(?=[A-Z][a-z])|_|((?<=[a-zA-Z])(?=[0-9]))";
+
+	@Override
+	public boolean isPassthrough() {
+		return false;
+	}
+
+	@Override
+	public boolean isCancelable() {
+		return true;
+	}
+
+	@Override
+	protected IOReport execute(ProgressIndicator progress, IOReporter reporter)
+			throws IOProviderConfigurationException, IOException {
+		progress.begin("Generating Shapefile", ProgressIndicator.UNKNOWN);
+		InstanceCollection instances = getInstances();
+		try {
+			URI location = getTarget().getLocation();
+			writeInstances(instances, progress, reporter, location);
+			reporter.setSuccess(true);
+		} catch (Exception e) {
+			reporter.error(new IOMessageImpl(e.getLocalizedMessage(), e));
+			reporter.setSuccess(false);
+			reporter.setSummary("Saving instances to Shapefile failed.");
+		} finally {
+			progress.end();
+		}
+
+		return reporter;
+	}
+
+	@Override
+	protected String getDefaultTypeName() {
+		return null;
+	}
+
+	/**
+	 * Write instances to the Shapefiles. It is a 4 step process. <br>
+	 * 1. create simpleFeatureType <br>
+	 * 2. create Shapefile schema from the feature collection. <br>
+	 * 3. create features <br>
+	 * 4. write the feature data to the Shapefile.
+	 * 
+	 * @param instances instance to write to.
+	 * @param progress the progress indicator.
+	 * @param reporter the reporter.
+	 * @param location file path URI.
+	 * 
+	 * @throws IOException exception in any.
+	 * 
+	 */
+
+	protected void writeInstances(InstanceCollection instances, ProgressIndicator progress,
+			IOReporter reporter, URI location) throws IOException {
+
+		// in all the variables, outer Map is for tracking multiple schemas and
+		// inner Map for multiple geometries.
+		Map<String, Map<String, SimpleFeatureType>> schemaFtMap = createFeatureType(instances,
+				progress, reporter);
+
+		Map<String, Map<String, ShapefileDataStore>> schemaDataStoreMap = createSchema(location,
+				schemaFtMap);
+
+		Map<String, Map<String, List<SimpleFeature>>> schemaFeaturesMap = createFeatures(instances,
+				progress, reporter, schemaFtMap);
+
+		writeToFile(schemaDataStoreMap, schemaFtMap, schemaFeaturesMap);
+	}
+
+	/**
+	 * Step 1. Method to create feature type for the shape file. This is the
+	 * first step, which creates the schema for the shape file.
+	 * 
+	 * shape file restrictions: <br>
+	 * a single geometry column named the_geom <br>
+	 * - "the_geom" is always first, and used for geometry attribute name <br>
+	 * - "the_geom" must be of type Point, MultiPoint, MuiltiLineString,
+	 * MultiPolygon<br>
+	 * - Attribute names are limited in length<br>
+	 * - Not all data types are supported (example Timestamp represented as
+	 * Date)<br>
+	 * 
+	 * @param instances the instance to write.
+	 * @param progress the progress indicator.
+	 * @param reporter the reporter.
+	 * @return map of SimpleFeatureType type used as a template to describe the
+	 *         file contents.
+	 */
+	private Map<String, Map<String, SimpleFeatureType>> createFeatureType(
+			InstanceCollection instances, ProgressIndicator progress, IOReporter reporter) {
+		// 1. create simpleFeatureType
+		Map<String, Map<String, SimpleFeatureType>> schemaSftMap = new HashMap<String, Map<String, SimpleFeatureType>>();
+
+		Map<String, Map<String, SimpleFeatureTypeBuilder>> schemaBuilderMap = new HashMap<String, Map<String, SimpleFeatureTypeBuilder>>();
+
+		List<String> missingGeomsForSchemas = new ArrayList<String>();
+		try (ResourceIterator<Instance> it = instances.iterator()) {
+			while (it.hasNext() && !progress.isCanceled()) {
+				Instance instance = it.next();
+				TypeDefinition type = instance.getDefinition();
+
+				String localPart = type.getName().getLocalPart();
+				if (schemaBuilderMap.get(localPart) == null) {
+					Map<String, SimpleFeatureTypeBuilder> geometryBuilderMap = new HashMap<String, SimpleFeatureTypeBuilder>();
+					writeGeometrySchema(instance, localPart, geometryBuilderMap,
+							missingGeomsForSchemas);
+
+					// add rest of the properties to the
+					// SimpleFeatureTypeBuilder.
+					writePropertiesSchema(instance, type, geometryBuilderMap);
+					schemaBuilderMap.put(localPart, geometryBuilderMap);
+				}
+				// else nothing to do as the schema definition is already
+				// present.
+			}
+		}
+		for (String localPart : missingGeomsForSchemas) {
+			reporter.error(
+					"Cannot create Shapefile for Schema: " + localPart + " as no Geometry found!!");
+		}
+		// create SimpleFeatureType from SimpleFeatureTypeBuilder.
+		for (Entry<String, Map<String, SimpleFeatureTypeBuilder>> schemaEntry : schemaBuilderMap
+				.entrySet()) {
+			for (Entry<String, SimpleFeatureTypeBuilder> geometryEntry : schemaEntry.getValue()
+					.entrySet()) {
+				SimpleFeatureType buildFeatureType = geometryEntry.getValue().buildFeatureType();
+				schemaSftMap
+						.computeIfAbsent(schemaEntry.getKey(),
+								k -> new HashMap<String, SimpleFeatureType>())
+						.put(geometryEntry.getKey(), buildFeatureType);
+			}
+		}
+		return schemaSftMap;
+	}
+
+	/**
+	 * Method to write Geometry definition to the shape file schema.
+	 * 
+	 * @param instance instance.
+	 * @param localPart local part of <code>QName</code> which tracks multiple
+	 *            schemas.
+	 * @param geometryBuilderMap SimpleFeatureType to build schema definition
+	 *            for the shape file.
+	 * @param missingGeomsForSchemas track all the schemas with missing
+	 *            geometry, so that later they can be logged in the reporter and
+	 *            prevent throwing exception in case of more than one schema to
+	 *            export.
+	 */
+	private void writeGeometrySchema(Instance instance, String localPart,
+			Map<String, SimpleFeatureTypeBuilder> geometryBuilderMap,
+			List<String> missingGeomsForSchemas) {
+		Geometry geom = null;
+
+		List<GeometryProperty<?>> geoms = traverseInstanceForGeometries(instance);
+
+		// add geometries to the shape SimpleFeatureTypeBuilder.
+		if (geoms.size() > 1) {
+			for (GeometryProperty<?> geoProp : geoms) {
+				geom = geoProp.getGeometry();
+				createSimpleFeatureTypeBuilderWithGeometry(localPart, geometryBuilderMap, geom,
+						geoProp);
+			}
+		}
+		else if (!geoms.isEmpty()) {
+			geom = geoms.get(0).getGeometry();
+			createSimpleFeatureTypeBuilderWithGeometry(localPart, geometryBuilderMap, geom,
+					geoms.get(0));
+		}
+		else {
+			missingGeomsForSchemas.add(localPart);
+		}
+	}
+
+	/**
+	 * Method to write schema definition for all the properties.
+	 * 
+	 * @param instance instance to write to.
+	 * @param type type definition.
+	 * @param geometryBuilderMap SimpleFeatureType to build schema definition
+	 *            for the shape file.
+	 */
+	private void writePropertiesSchema(Instance instance, TypeDefinition type,
+			Map<String, SimpleFeatureTypeBuilder> geometryBuilderMap) {
+		Collection<? extends PropertyDefinition> allNonComplexProperties = getNonComplexProperties(
+				type);
+		for (PropertyDefinition prop : allNonComplexProperties) {
+			Class<?> binding = prop.getPropertyType().getConstraint(Binding.class).getBinding();
+			// ignore geometry and filename properties.
+			if (!prop.getPropertyType().getConstraint(GeometryType.class).isGeometry()
+					&& !prop.getName().getNamespaceURI()
+							.equalsIgnoreCase(ShapefileConstants.SHAPEFILE_AUGMENT_NS)) {
+				// intentionally removing instance.getProperty(prop.getName())
+				// != null, otherwise some properties that are null here are
+				// read in step 3. This change will export all the attributes.
+				Set<String> keySet = geometryBuilderMap.keySet();
+				for (String key : keySet) {
+					String propName = truncatePropertyName(prop.getName().getLocalPart());
+					geometryBuilderMap.get(key).add(propName, binding);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Method to truncate the property names up to 9 characters by splitting
+	 * them from camelCase, snake_case, or alphanumeric characters. E.g. <br/>
+	 * camelCase: caCa<br/>
+	 * snake_case: snca <br/>
+	 * alpha1234; al12 <br/>
+	 * snake_camelCase: sncaCa <br/>
+	 * snake_camelCase1234: sncaCa12 <br/>
+	 * population: populati
+	 * 
+	 * As the Shapefile DB doesn't allow more than 10 characters, the change is
+	 * required to avoid exporting null values to the columns whose name is
+	 * greater than 10 characters. This method intentionally truncates up to 9
+	 * characters to leave a room for the unexpected scenario(s) where the
+	 * truncated names might clash, then the values will be append with the
+	 * integers by the library and the null values will be exported (should be a
+	 * rare scenario).
+	 * 
+	 * @param propName property name to be truncated.
+	 * @return truncated property name with max 9 characters.
+	 */
+	private String truncatePropertyName(String propName) {
+		if (propName != null && propName.length() > 8) {
+			String[] split = propName.split(REGEX);
+			if (split.length > 1) {
+				StringBuilder propNameFormatted = new StringBuilder();
+
+				Arrays.stream(split).forEach(s -> propNameFormatted
+						.append(s.substring(0, s.length() > 2 ? 2 : s.length())));
+				propName = propNameFormatted.toString();
+				int stringLen = propName.length() > 8 ? 8 : propName.length();
+				propName = propName.substring(0, stringLen);
+			}
+			else {
+				// as it is greater than 8 but there is nothing to split. So
+				// instead of truncating it with 2 characters, truncate it with
+				// 8 characters.
+				propName = propName.substring(0, 8);
+			}
+
+		}
+		return propName;
+	}
+
+	/**
+	 * Method to traverse instance to find geometries.
+	 * 
+	 * @param instance instance.
+	 * @return list of geometries.
+	 */
+	private List<GeometryProperty<?>> traverseInstanceForGeometries(Instance instance) {
+		// find geometries in the schema.
+		InstanceTraverser traverser = new DepthFirstInstanceTraverser(true);
+		GeometryFinder geoFind = new GeometryFinder(null);
+		traverser.traverse(instance, geoFind);
+
+		List<GeometryProperty<?>> geoms = geoFind.getGeometries();
+		return geoms;
+	}
+
+	/**
+	 * Method to retrieve all the properties.
+	 * 
+	 * @param type type definition.
+	 * @return Collection of all the properties.
+	 */
+	private Collection<? extends PropertyDefinition> getNonComplexProperties(TypeDefinition type) {
+		Collection<? extends PropertyDefinition> allNonComplexProperties = DefinitionUtil
+				.getAllProperties(type).stream().filter(p -> {
+					// filter out complex properties w/o HasValue or
+					// AugmentedValue
+					return p.getPropertyType().getConstraint(HasValueFlag.class).isEnabled() || p
+							.getPropertyType().getConstraint(AugmentedValueFlag.class).isEnabled();
+				}).collect(Collectors.toList());
+		return allNonComplexProperties;
+	}
+
+	/**
+	 * Convenience method to create SimpleFeatureTypeBuilder with geometry and
+	 * target CRS information.
+	 * 
+	 * @param localPart local part of <code>QName</code> which tracks multiple
+	 *            schemas.
+	 * @param geometryBuilderMap simpleFeatureTypeBuilder which adds schema info
+	 *            for the shape file.
+	 * @param geom geometry.
+	 * @param geoProp GeometryProperty.
+	 */
+	private void createSimpleFeatureTypeBuilderWithGeometry(String localPart,
+			Map<String, SimpleFeatureTypeBuilder> geometryBuilderMap, Geometry geom,
+			GeometryProperty<?> geoProp) {
+		SimpleFeatureTypeBuilder sftBuilder = new SimpleFeatureTypeBuilder();
+		sftBuilder.setName(localPart);
+		sftBuilder.setNamespaceURI(ShapefileConstants.SHAPEFILE_NS);
+
+		CRSDefinition targetCrs = getTargetCRS();
+		if (targetCrs != null) {
+			sftBuilder.setCRS(targetCrs.getCRS());
+		}
+		else {
+			sftBuilder.setCRS(geoProp.getCRSDefinition().getCRS());
+		}
+		sftBuilder.add(ShapefileConstants.THE_GEOM, geom.getClass());
+		geometryBuilderMap.put(geom.getGeometryType(), sftBuilder);
+	}
+
+	/**
+	 * Step 2. method to create schema. This method will create filename as:<br>
+	 * - filename_schemaName_geometryType.shp if multiple schema and geom.<br>
+	 * - filename_schemaName.shp if multiple schemas.<br>
+	 * - filename_geometryType.shp if multiple geometries.<br>
+	 * - filename.shp single schema and geom.
+	 * 
+	 * @param location location to store the shape files.
+	 * 
+	 * @param schemaSftMap type is used as a template to describe the file
+	 *            contents.
+	 * @return shape file data store.
+	 * @throws IOException exception if any.
+	 */
+	private Map<String, Map<String, ShapefileDataStore>> createSchema(URI location,
+			Map<String, Map<String, SimpleFeatureType>> schemaSftMap) throws IOException {
+
+		if (schemaSftMap.isEmpty()) {
+			throw new IOException("Cannot export to the shape file as no Geometry found!!");
+		}
+		Map<String, Map<String, ShapefileDataStore>> schemaDataStoreMap = new HashMap<String, Map<String, ShapefileDataStore>>();
+
+		// logic to create file name based on the multiple schemas and/or
+		// multiple geometries.
+		int numberOfSchemas = schemaSftMap.keySet().size();
+		for (Entry<String, Map<String, SimpleFeatureType>> schemaEntry : schemaSftMap.entrySet()) {
+			int numberOfGeometries = schemaEntry.getValue().keySet().size();
+			for (Entry<String, SimpleFeatureType> geometryEntry : schemaEntry.getValue()
+					.entrySet()) {
+
+				Map<String, Serializable> params = new HashMap<String, Serializable>();
+				File file = createFileWithFormattedName(location, numberOfSchemas, schemaEntry,
+						numberOfGeometries, geometryEntry);
+				params.put(ShapefileConstants.URL_STRING, file.toURI().toURL());
+				// create schema.
+				ShapefileDataStoreFactory dataStoreFactory = new ShapefileDataStoreFactory();
+				ShapefileDataStore newDataStore;
+
+				newDataStore = (ShapefileDataStore) dataStoreFactory.createNewDataStore(params);
+				newDataStore.createSchema(geometryEntry.getValue());
+				schemaDataStoreMap
+						.computeIfAbsent(schemaEntry.getKey(),
+								k -> new HashMap<String, ShapefileDataStore>())
+						.put(geometryEntry.getKey(), newDataStore);
+			}
+		}
+		return schemaDataStoreMap;
+	}
+
+	/**
+	 * Method to create file name based on the number of schema and geom:<br>
+	 * - filename_schemaName_geometryType.shp if multiple schema and geom.<br>
+	 * - filename_schemaName.shp if multiple schemas.<br>
+	 * - filename_geometryType.shp if multiple geometries.<br>
+	 * - filename.shp single schema and geom.
+	 * 
+	 * @param location file location.
+	 * @param numberOfSchemas number of schemas.
+	 * @param schemaEntry current schema in process.
+	 * @param numberOfGeometries number of geometries in the schema.
+	 * @param geometryEntry current geometry entry in process.
+	 * @return file with the formatted file name.
+	 */
+	private File createFileWithFormattedName(URI location, int numberOfSchemas,
+			Entry<String, Map<String, SimpleFeatureType>> schemaEntry, int numberOfGeometries,
+			Entry<String, SimpleFeatureType> geometryEntry) {
+		String filenameWithType = location.getPath();
+		String filePath = Paths.get(location).getParent().toString();
+		String baseFilename = Paths.get(location).getFileName().toString();
+		baseFilename = baseFilename.substring(0, baseFilename.lastIndexOf("."));
+		if (numberOfSchemas > 1) {
+			if (numberOfGeometries > 1) {
+				filenameWithType = filePath + FileSystems.getDefault().getSeparator() + baseFilename
+						+ ShapefileConstants.UNDERSCORE + schemaEntry.getKey()
+						+ ShapefileConstants.UNDERSCORE + geometryEntry.getKey()
+						+ ShapefileConstants.SHP_EXTENSION;
+			}
+			else {
+				filenameWithType = filePath + FileSystems.getDefault().getSeparator() + baseFilename
+						+ ShapefileConstants.UNDERSCORE + schemaEntry.getKey()
+						+ ShapefileConstants.SHP_EXTENSION;
+			}
+		}
+		else if (numberOfGeometries > 1) {
+			filenameWithType = filePath + FileSystems.getDefault().getSeparator() + baseFilename
+					+ ShapefileConstants.UNDERSCORE + geometryEntry.getKey()
+					+ ShapefileConstants.SHP_EXTENSION;
+		}
+		File file;
+		try {
+			file = new File(filenameWithType);
+		} catch (Exception e) {
+			throw new IllegalArgumentException("Only files are supported as data source", e);
+		}
+		if (file.exists() && file.length() == 0L) {
+			// convenience for overwriting to empty existing file.
+			file.delete();
+		}
+		return file;
+	}
+
+	/**
+	 * * Step 3. method to create features for the shape files and write them as
+	 * per the schema definition.<br>
+	 * Always the first entry should be "the_geom" then rest of the properties
+	 * can be written.
+	 * 
+	 * @param instances instance to write.
+	 * @param progress the progress indicator.
+	 * @param reporter the reporter.
+	 * @param schemaFtMap type is used as a template to describe the file
+	 *            contents.
+	 * @return list all the features to be added to the file bundled in map for
+	 *         multiple schemas and multiple geometries.
+	 */
+	private Map<String, Map<String, List<SimpleFeature>>> createFeatures(
+			InstanceCollection instances, ProgressIndicator progress, IOReporter reporter,
+			Map<String, Map<String, SimpleFeatureType>> schemaFtMap) {
+		// 3. create features
+
+		Map<String, Map<String, List<SimpleFeature>>> schemaFeaturesMap = new HashMap<String, Map<String, List<SimpleFeature>>>();
+		Map<String, Map<String, SimpleFeatureBuilder>> schemaFbMap = new HashMap<String, Map<String, SimpleFeatureBuilder>>();
+
+		// initialize simple feature type builder for all the schemas and
+		// geometries.
+		for (Entry<String, Map<String, SimpleFeatureType>> schemaEntry : schemaFtMap.entrySet()) {
+			for (Entry<String, SimpleFeatureType> geomEntry : schemaEntry.getValue().entrySet()) {
+				schemaFbMap
+						.computeIfAbsent(schemaEntry.getKey(),
+								k -> new HashMap<String, SimpleFeatureBuilder>())
+						.computeIfAbsent(geomEntry.getKey(),
+								k1 -> new SimpleFeatureBuilder(geomEntry.getValue()));
+			}
+		}
+
+		// write features to shape file schema.
+		try (ResourceIterator<Instance> it = instances.iterator()) {
+			while (it.hasNext() && !progress.isCanceled()) {
+
+				Instance instance = it.next();
+				TypeDefinition type = instance.getDefinition();
+				String localPart = type.getName().getLocalPart();
+				if (schemaFtMap.containsKey(localPart)) {
+					writeGeometryInstanceData(reporter, schemaFbMap, instance, localPart);
+					// add data for the rest of the properties.
+					writePropertiesInstanceData(schemaFbMap, instance, type, localPart);
+
+					// create list of simple features.
+					Set<String> geometryKeys = schemaFbMap.get(localPart).keySet();
+					for (String key : geometryKeys) {
+						SimpleFeature feature = schemaFbMap.get(localPart).get(key)
+								.buildFeature(null);
+						schemaFeaturesMap
+								.computeIfAbsent(localPart,
+										k -> new HashMap<String, List<SimpleFeature>>())
+								.computeIfAbsent(key, k1 -> new ArrayList<>()).add(feature);
+					}
+				}
+				// else the schema was deleted as there wasn't any geometry in
+				// it.
+			}
+		}
+		return schemaFeaturesMap;
+	}
+
+	/**
+	 * Method to write the geometry in the shape file schema.
+	 * 
+	 * @param reporter reporter.
+	 * @param schemaFbMap map of feature builder to write the data to.
+	 * @param instance instance
+	 * @param localPart local part of <code>QName</code> which tracks multiple
+	 *            schemas.
+	 */
+	private void writeGeometryInstanceData(IOReporter reporter,
+			Map<String, Map<String, SimpleFeatureBuilder>> schemaFbMap, Instance instance,
+			String localPart) {
+		List<GeometryProperty<?>> geoms = traverseInstanceForGeometries(instance);
+
+		if (geoms.size() > 1) {
+			for (GeometryProperty<?> geoProp : geoms) {
+				addGeometryData(reporter, schemaFbMap, localPart, geoProp);
+			}
+		}
+		else if (!geoms.isEmpty()) {
+			addGeometryData(reporter, schemaFbMap, localPart, geoms.get(0));
+		}
+	}
+
+	/**
+	 * Method to write all the property data in the shape file schema.
+	 * 
+	 * @param schemaFbMap map of feature builder to write the data to.
+	 * @param instance instance.
+	 * @param type type definition.
+	 * @param localPart local part of <code>QName</code> which tracks multiple
+	 *            schemas.
+	 */
+	private void writePropertiesInstanceData(
+			Map<String, Map<String, SimpleFeatureBuilder>> schemaFbMap, Instance instance,
+			TypeDefinition type, String localPart) {
+		Collection<? extends PropertyDefinition> allNonComplexProperties = getNonComplexProperties(
+				type);
+		for (PropertyDefinition prop : allNonComplexProperties) {
+			if (!prop.getPropertyType().getConstraint(GeometryType.class).isGeometry()
+					&& !prop.getName().getNamespaceURI()
+							.equalsIgnoreCase(ShapefileConstants.SHAPEFILE_AUGMENT_NS)
+					&& prop.getName().getLocalPart() != null) {
+				Object value = new InstanceAccessor(instance)
+						.findChildren(prop.getName().getLocalPart()).value();
+				Set<String> geometryKeys = schemaFbMap.get(localPart).keySet();
+				for (String key : geometryKeys) {
+					schemaFbMap.get(localPart).get(key).add(value);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Convenience method to convert geometry to the target CRS and add to the
+	 * feature builder.
+	 * 
+	 * @param reporter the reporter
+	 * @param schemaFbMap featureBuilder to add all the data in the shape file
+	 *            schema.
+	 * @param localPart local part of <code>QName</code> which tracks multiple
+	 *            schemas.
+	 * @param geometryProperty geometry property to extract the CRS definition
+	 *            and the geometry.
+	 */
+	private void addGeometryData(IOReporter reporter,
+			Map<String, Map<String, SimpleFeatureBuilder>> schemaFbMap, String localPart,
+			GeometryProperty<?> geometryProperty) {
+		Geometry geom = geometryProperty.getGeometry();
+		if (getTargetCRS() != null) {
+			geom = convertGeometry(geometryProperty.getGeometry(),
+					geometryProperty.getCRSDefinition(), reporter).getFirst();
+		}
+		schemaFbMap.get(localPart).get(geom.getGeometryType()).add(geom);
+
+	}
+
+	/**
+	 * Final step to write to the shape file using transaction.
+	 * 
+	 * @param schemaDataStoreMap data store for the shape file.
+	 * @param schemaFtMap used as a template to describe the file contents.
+	 * @param schemaFeaturesMap for each schema, each geom list of features to
+	 *            be written to the shape file.
+	 * @throws IOException if any.
+	 */
+	private void writeToFile(Map<String, Map<String, ShapefileDataStore>> schemaDataStoreMap,
+			Map<String, Map<String, SimpleFeatureType>> schemaFtMap,
+			Map<String, Map<String, List<SimpleFeature>>> schemaFeaturesMap) throws IOException {
+
+		// extract each schema
+		for (Entry<String, Map<String, ShapefileDataStore>> schemaEntry : schemaDataStoreMap
+				.entrySet()) {
+			String localPart = schemaEntry.getKey();
+			// extract each geometry.
+			for (Entry<String, ShapefileDataStore> geomEntry : schemaEntry.getValue().entrySet()) {
+				Transaction transaction = new DefaultTransaction(
+						ShapefileConstants.CREATE_CONSTANT);
+				String typeName = geomEntry.getValue().getTypeNames()[0];
+
+				SimpleFeatureSource geomSpecificFeatureSource = geomEntry.getValue()
+						.getFeatureSource(typeName);
+				if (geomSpecificFeatureSource instanceof SimpleFeatureStore) {
+					SimpleFeatureStore geomSpecificFeatureStore = (SimpleFeatureStore) geomSpecificFeatureSource;
+
+					// create collection to write to the shape file.
+					SimpleFeatureCollection collection = new ListFeatureCollection(
+							schemaFtMap.get(localPart).get(geomEntry.getKey()),
+							schemaFeaturesMap.get(localPart).get(geomEntry.getKey()));
+					geomSpecificFeatureStore.setTransaction(transaction);
+					try {
+						geomSpecificFeatureStore.addFeatures(collection);
+						transaction.commit();
+					} catch (IOException e) {
+						transaction.rollback();
+						throw e;
+					} finally {
+						transaction.close();
+					}
+				}
+				else {
+					// throw exception
+					transaction.close();
+					throw new IOException(typeName + " does not support read/write access");
+				}
+			}
+		}
+	}
+
+}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.validation.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.validation.ui/META-INF/MANIFEST.MF
index 239353b5c9..90853feb29 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.validation.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.validation.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Validation UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.validation.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.validation.ui/src/eu/esdihumboldt/hale/io/validation/ui/ValidatorConfigurationImportUIAdvisor.java b/io/plugins/eu.esdihumboldt.hale.io.validation.ui/src/eu/esdihumboldt/hale/io/validation/ui/ValidatorConfigurationImportUIAdvisor.java
index ff6a5f1fa4..3d0c2be13d 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.validation.ui/src/eu/esdihumboldt/hale/io/validation/ui/ValidatorConfigurationImportUIAdvisor.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.validation.ui/src/eu/esdihumboldt/hale/io/validation/ui/ValidatorConfigurationImportUIAdvisor.java
@@ -34,7 +34,7 @@ public Class<ValidatorConfiguration> getRepresentationType() {
 	}
 
 	@Override
-	public boolean supportsRemoval() {
+	public boolean supportsRemoval(String resourceId) {
 		return true;
 	}
 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.validation/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.validation/META-INF/MANIFEST.MF
index 3787cc40b6..2fd95c9c09 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.validation/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.validation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance Validation
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.validation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.wfs.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.wfs.test/META-INF/MANIFEST.MF
index 6a7bbe894f..394d28e4ca 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.wfs.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.wfs.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WFS I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.wfs.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.wfs;bundle-version="2.9.1",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF
index 77ff0dc32c..0ae8bd75a8 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.wfs.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: WFS I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.wfs.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.wfs/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.wfs/META-INF/MANIFEST.MF
index aa3a7ddb81..a80eb77429 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.wfs/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.wfs/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Support for WFS-T
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.wfs;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.io.gml;bundle-version="2.9.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xls.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xls.test/META-INF/MANIFEST.MF
index f56dfae948..aa4ff3f150 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xls.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xls.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XLS Instance Test
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xls.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xls.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xls.ui/META-INF/MANIFEST.MF
index 2708d6d878..b8e03aaf05 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xls.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xls.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XLS UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xls.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  eu.esdihumboldt.hale.ui
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xls/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xls/META-INF/MANIFEST.MF
index fce2fc7c73..98bd5305ef 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xls/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XLS/Instance I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xls;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.orientechnologies.orient.core.db.record;version="1.5.1";resolution:=optional,
  de.fhg.igd.eclipse.util.extension,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xml/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xml/META-INF/MANIFEST.MF
index 33cf4ac601..1357e03302 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xml/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML Validation
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xml;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="17.0.0",
  de.fhg.igd.slf4jplus,
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xml/src/eu/esdihumboldt/hale/io/xml/validator/internal/SchemaResolver.java b/io/plugins/eu.esdihumboldt.hale.io.xml/src/eu/esdihumboldt/hale/io/xml/validator/internal/SchemaResolver.java
index 215898bc4c..19737188c4 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xml/src/eu/esdihumboldt/hale/io/xml/validator/internal/SchemaResolver.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.xml/src/eu/esdihumboldt/hale/io/xml/validator/internal/SchemaResolver.java
@@ -63,7 +63,7 @@ public LSInput resolveResource(String type, String namespaceURI, String publicId
 			schemaLocation = loc.substring(0, loc.lastIndexOf("/") + 1); //$NON-NLS-1$
 		}
 
-		if (systemId.indexOf("http://") < 0) { //$NON-NLS-1$
+		if (systemId.indexOf("http://") < 0 && systemId.indexOf("https://") < 0) { //$NON-NLS-1$
 			systemId = schemaLocation + systemId;
 		}
 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xsd.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xsd.test/META-INF/MANIFEST.MF
index ac7f444705..2b95f4889e 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xsd.test/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xsd.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML Schema I/O Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xsd.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.hale.io.xsd;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="9.0.0"
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xsd.ui/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xsd.ui/META-INF/MANIFEST.MF
index 0a6167ed27..18c8c4e06b 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xsd.ui/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xsd.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML Schema I/O UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xsd.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.2",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF
index dcdba1b00a..d24dd940b8 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF
+++ b/io/plugins/eu.esdihumboldt.hale.io.xsd/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML Schema I/O
 Bundle-SymbolicName: eu.esdihumboldt.hale.io.xsd;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="1.6.0",
  com.google.common.collect;version="17.0.0",
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xsd/src/eu/esdihumboldt/hale/io/xsd/reader/XmlSchemaReader.java b/io/plugins/eu.esdihumboldt.hale.io.xsd/src/eu/esdihumboldt/hale/io/xsd/reader/XmlSchemaReader.java
index 8592f6b852..50c135edd2 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xsd/src/eu/esdihumboldt/hale/io/xsd/reader/XmlSchemaReader.java
+++ b/io/plugins/eu.esdihumboldt.hale.io.xsd/src/eu/esdihumboldt/hale/io/xsd/reader/XmlSchemaReader.java
@@ -21,6 +21,7 @@
 import java.net.URISyntaxException;
 import java.text.MessageFormat;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -65,6 +66,7 @@
 import org.apache.ws.commons.schema.utils.NamespacePrefixList;
 import org.w3c.dom.Node;
 
+import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSet;
 
 import de.fhg.igd.slf4jplus.ALogger;
@@ -355,8 +357,9 @@ else if (location.getScheme().equals("bundleresource")) { //$NON-NLS-1$
 		// create group counter
 		groupCounter = new TObjectIntHashMap<String>();
 
-		Set<String> imports = new HashSet<String>();
-		imports.add(location.toString());
+		// Map schema locations to target namespaces
+		Map<String, String> imports = new HashMap<>();
+		imports.put(location.toString(), namespace);
 
 		// load XML Schema schema (for base type definitions)
 		try {
@@ -520,8 +523,8 @@ public boolean isOnlyElementsMappable() {
 	 * @param mainSchema states if this is a main schema and therefore elements
 	 *            declared here should be flagged mappable
 	 */
-	protected void loadSchema(String schemaLocation, XmlSchema xmlSchema, Set<String> imports,
-			ProgressIndicator progress, boolean mainSchema) {
+	protected void loadSchema(String schemaLocation, XmlSchema xmlSchema,
+			Map<String, String> imports, ProgressIndicator progress, boolean mainSchema) {
 		String namespace = xmlSchema.getTargetNamespace();
 		if (namespace == null) {
 			namespace = XMLConstants.NULL_NS_URI;
@@ -689,15 +692,26 @@ else if (item instanceof XmlSchemaNotation) {
 				XmlSchemaExternal imp = (XmlSchemaExternal) externalItems.getItem(i);
 				XmlSchema importedSchema = imp.getSchema();
 				String location = importedSchema.getSourceURI();
-				if (!(imports.contains(location))) { // only add schemas that
+				String targetNamespace = importedSchema.getTargetNamespace();
+				if (!imports.containsKey(location)) { // only add schemas that
 														// were not already
 														// added
-					imports.add(location); // place a marker in the map to
-											// prevent loading the location in
-											// the call to loadSchema
-					loadSchema(location, importedSchema, imports, progress,
-							mainSchema && imp instanceof XmlSchemaInclude);
-					// is part of main schema if it's a main schema include
+					boolean addedBefore = imports.entrySet().stream().anyMatch(e -> {
+						// Consider two schemas to be identical if their schema
+						// locations differ only in the scheme part (e.g. "http"
+						// and "https") and they have the same target namespace.
+						return targetNamespace.equals(e.getValue())
+								&& schemeIndependentEquals(location, e.getKey());
+					});
+
+					if (!addedBefore) {
+						// place a marker in the map to prevent loading the
+						// location in the call to loadSchema
+						imports.put(location, targetNamespace);
+						loadSchema(location, importedSchema, imports, progress,
+								mainSchema && imp instanceof XmlSchemaInclude);
+						// is part of main schema if it's a main schema include
+					}
 				}
 				if (imp instanceof XmlSchemaInclude) {
 					includes.add(location);
@@ -714,6 +728,21 @@ else if (item instanceof XmlSchemaNotation) {
 				MessageFormat.format(Messages.getString("ApacheSchemaProvider.33"), namespace)); //$NON-NLS-1$
 	}
 
+	private boolean schemeIndependentEquals(String schemaLocationA, String schemaLocationB) {
+		final URI a, b;
+
+		try {
+			a = URI.create(schemaLocationA);
+			b = URI.create(schemaLocationB);
+		} catch (Throwable t) {
+			// If any of the schema locations can't be parsed as an URI, fall
+			// back to a regular equals (null-safe)
+			return Objects.equal(schemaLocationA, schemaLocationB);
+		}
+
+		return a.getSchemeSpecificPart().equals(b.getSchemeSpecificPart());
+	}
+
 	/**
 	 * Configure the mapping relevant flag for a type.
 	 * 
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.classpath b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.classpath
deleted file mode 100644
index eca7bdba8f..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.project b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.project
deleted file mode 100644
index a8df6208af..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>eu.esdihumboldt.hale.io.xtraserver.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.core.resources.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 2f2b83f535..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created from default preferences 13-mag-2015 11.02.50
-#Wed May 13 11:02:50 CEST 2015
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 8206bd7b86..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,397 +0,0 @@
-#Updated from default preferences Apr 13, 2018 1:16:48 PM
-#Fri Apr 13 13:16:48 CEST 2018
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch,.svn/
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=,_
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=false
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.launching.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.launching.prefs
deleted file mode 100644
index 1bb10d4228..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.jdt.launching.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created from default preferences 13-mag-2015 11.02.50
-#Wed May 13 11:02:50 CEST 2015
-eclipse.preferences.version=1
-org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index 0730adc738..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created from default preferences 13-mag-2015 11.02.50
-#Wed May 13 11:02:50 CEST 2015
-eclipse.preferences.version=1
-resolve.requirebundle=false
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/META-INF/MANIFEST.MF
deleted file mode 100644
index dc84ecfdd0..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tests for XtraServer Mapping I/O
-Bundle-SymbolicName: eu.esdihumboldt.hale.io.xtraserver.test
-Bundle-Version: 4.0.0.qualifier
-Bundle-Vendor: interactive instruments GmbH
-Fragment-Host: eu.esdihumboldt.hale.io.xtraserver;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: com.typesafe.config;version="1.2.1",
- eu.esdihumboldt.cst.test,
- eu.esdihumboldt.hale.common.align.io,
- eu.esdihumboldt.hale.common.core.io.extension,
- eu.esdihumboldt.hale.common.core.io.project,
- eu.esdihumboldt.hale.common.core.io.project.impl,
- eu.esdihumboldt.hale.common.core.io.project.model,
- eu.esdihumboldt.hale.common.core.service,
- eu.esdihumboldt.hale.common.headless,
- eu.esdihumboldt.hale.common.headless.impl,
- eu.esdihumboldt.hale.common.headless.test,
- eu.esdihumboldt.hale.common.lookup.impl,
- eu.esdihumboldt.hale.common.schema.persist.hsd,
- eu.esdihumboldt.hale.common.test,
- eu.esdihumboldt.hale.io.xsd.reader,
- eu.esdihumboldt.util.io,
- org.apache.commons.io,
- org.junit;version="4.11.0"
-Automatic-Module-Name: eu.esdihumboldt.hale.io.xtraserver.test
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/Cities.xsd b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/Cities.xsd
deleted file mode 100644
index c12934610b..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/Cities.xsd
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 
- targetNamespace="http://www.interactive-instruments.de/namespaces/demo/cities/4.0/cities"
- xmlns:ci="http://www.interactive-instruments.de/namespaces/demo/cities/4.0/cities"
- xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:ogc="http://www.opengis.net/ogc" 
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
- xmlns:gml="http://www.opengis.net/gml/3.2" 
- elementFormDefault="qualified" version="2.0">
-
-	<import namespace="http://www.opengis.net/gml/3.2" schemaLocation="http://schemas.opengis.net/gml/3.2.1/gml.xsd"/>
-	
-	<!-- (c) 2012-2014 by interactive instruments GmbH -->
-
-	<!-- NamedGeoObject (abstract) -->
-	<element name="NamedGeoObject" substitutionGroup="gml:AbstractFeature" type="ci:NamedGeoObjectType" abstract="true">
-		<annotation>
-			<documentation>Abstract object carrying common attributes</documentation>
-		</annotation>
-	</element>
-	<complexType name="NamedGeoObjectType">
-		<complexContent>
-			<extension base="gml:AbstractFeatureType">
-				<sequence>
-					<element name="name" type="string" minOccurs="0">
-						<annotation>
-							<documentation>Name of the city</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- Cities -->
-	<element name="City" substitutionGroup="ci:NamedGeoObject" type="ci:CityType">
-		<annotation>
-			<documentation>Representation of Cities</documentation>
-		</annotation>
-	</element>
-	<complexType name="CityType">
-		<complexContent>
-			<extension base="ci:NamedGeoObjectType">
-				<sequence>
-					<element name="location" type="gml:PointPropertyType">
-						<annotation>
-							<documentation>The location of the city given as point geometry</documentation>
-						</annotation>
-					</element>
-					<element name="alternativeName" type="ci:AlternativeNamePropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>Zero or more alternative names of the city</documentation>
-						</annotation>
-					</element>
-					<element name="country" type="string">
-						<annotation>
-							<documentation>Example of a property mapped to a constant value</documentation>
-						</annotation>
-					</element>
-					<element name="inhabitants" type="integer">
-						<annotation>
-							<documentation>The number of inhabitants</documentation>
-						</annotation>
-					</element>
-					<element name="function" type="string" nillable="true">
-						<annotation>
-							<documentation>Special function of City. Example of a nillable property.</documentation>
-						</annotation>
-					</element>
-					<element name="district" type="ci:DistrictPropertyType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>District objects being part of the city object</documentation>
-						</annotation>
-					</element>
-					<element name="passingRiver" type="gml:ReferenceType" minOccurs="0" maxOccurs="unbounded">
-						<annotation>
-							<documentation>References to river objects passing the city</documentation>
-							<appinfo>
-								<targetElement xmlns="http://www.opengis.net/gml/3.2">ci:River</targetElement>
-							</appinfo>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-
-	<!-- Districts -->
-	<element name="District" substitutionGroup="ci:NamedGeoObject" type="ci:DistrictType">
-		<annotation>
-			<documentation>Representation of city districts</documentation>
-		</annotation>
-	</element>
-	<complexType name="DistrictType">
-		<complexContent>
-			<extension base="ci:NamedGeoObjectType">
-				<sequence>
-					<element name="location" type="gml:PointPropertyType">
-						<annotation>
-							<documentation>The location of the city district given as point geometry</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="DistrictPropertyType">
-		<sequence>
-			<element ref="ci:District"/>
-		</sequence>
-	</complexType>	
-
-	<!-- Rivers -->
-	<element name="River" substitutionGroup="ci:NamedGeoObject" type="ci:RiverType">
-		<annotation>
-			<documentation>Representation of Rivers</documentation>
-		</annotation>
-	</element>
-	<complexType name="RiverType">
-		<complexContent>
-			<extension base="ci:NamedGeoObjectType">
-				<sequence>
-					<element name="location" type="gml:MultiCurvePropertyType">
-						<annotation>
-							<documentation>The location of the river given as multi-curve geometry</documentation>
-						</annotation>
-					</element>
-					<element name="length" type="integer">
-						<annotation>
-							<documentation>The length of this river in km</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="RiverPropertyType">
-		<sequence>
-			<element ref="ci:River"/>
-		</sequence>
-	</complexType>
-	
-	<!-- States -->
-	<element name="State" substitutionGroup="ci:NamedGeoObject" type="ci:StateType">
-		<annotation>
-			<documentation>Representation of states</documentation>
-		</annotation>
-	</element>
-	<complexType name="StateType">
-		<complexContent>
-			<extension base="ci:NamedGeoObjectType">
-				<sequence>
-					<element name="location" type="gml:MultiSurfacePropertyType">
-						<annotation>
-							<documentation>The location of the state given as polygon geometry</documentation>
-						</annotation>
-					</element>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<complexType name="StatePropertyType">
-		<sequence>
-			<element ref="ci:State"/>
-		</sequence>
-	</complexType>
-
-	<!-- Alternative names -->
-	<element name="AlternativeName" substitutionGroup="gml:AbstractObject" type="ci:AlternativeNameType">
-		<annotation>
-			<documentation>Representation of alternative names of a city</documentation>
-		</annotation>
-	</element>
-	<complexType name="AlternativeNameType">
-		<sequence>
-			<element name="name" type="string">
-				<annotation>
-					<documentation>Alternative name of the city</documentation>
-				</annotation>
-			</element>
-			<element name="language" type="string">
-				<annotation>
-					<documentation>Language of alternative name</documentation>
-				</annotation>
-			</element>
-		</sequence>
-	</complexType>
-	<complexType name="AlternativeNamePropertyType">
-		<sequence>
-			<element ref="ci:AlternativeName"/>
-		</sequence>
-	</complexType>
-
-</schema>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/XtraServer_Mapping.xsd b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/XtraServer_Mapping.xsd
deleted file mode 100644
index d111c2dd61..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/XtraServer_Mapping.xsd
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema targetNamespace="http://www.interactive-instruments.de/namespaces/XtraServer" 
-        xmlns:xtraSrv="http://www.interactive-instruments.de/namespaces/XtraServer" 
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-        xmlns:xml="http://www.w3.org/XML/1998/namespace" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xmlns:xlink="http://www.w3.org/1999/xlink" 
-        xmlns:ogc="http://www.opengis.net/ogc" 
-        xmlns:wfs="http://www.opengis.net/wfs/2.0" 
-        elementFormDefault="qualified">
-
-<xsd:complexType name="MappingsSequenceType">
-		<xsd:sequence>
-			<xsd:choice minOccurs="0" maxOccurs="unbounded">
-				<xsd:element name="Table">
-					<xsd:complexType>
-						<xsd:simpleContent>
-							<xsd:extension base="xsd:string">
-								<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-								<xsd:attribute name="id" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="target" use="optional" type="xsd:string" default="">
-								</xsd:attribute>
-								<xsd:attribute name="match" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="disambiguate" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="map_targetpath" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="apply_mapping_to_path" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="applyMappingToPath" use="optional" type="xsd:boolean" >
-								</xsd:attribute>
-								<xsd:attribute name="mapping_mode" use="optional" default="value">
-									<xsd:simpleType>
-										<xsd:restriction base="xsd:string">
-											<xsd:enumeration value="value"/>
-											<xsd:enumeration value="nil"/>
-											<xsd:enumeration value="nil_attr"/>
-											<xsd:enumeration value="nilAttr"/>	<!-- obsolete -->
-										</xsd:restriction>
-									</xsd:simpleType>
-								</xsd:attribute>
-								<xsd:attribute name="filter_mapping" type="xsd:boolean" use="optional" default="false">
-								</xsd:attribute>
-								<xsd:attribute name="no_output" type="xsd:boolean" use="optional" >
-								</xsd:attribute>
-								<xsd:attribute name="noOutput" type="xsd:boolean" use="optional">
-								</xsd:attribute>
-								<xsd:attribute name="table_name" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="oid_col" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="ft_col" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="generator" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="value" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="value_type" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="valueType" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="srs" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="srid" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="mapped_geometry" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="isMappedGeometry" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="use_geotypes" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="useGeotypes" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="assign" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="assign1" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="significant_for_emptiness" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="significantForEmptiness" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="suppress_xml_entities_encoding" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="suppressXMLEntitiesEncoding" use="optional" type="xsd:boolean">
-								</xsd:attribute>
-								<xsd:attribute name="is_reference" use="optional" type="xsd:boolean" >
-								</xsd:attribute>
-								<xsd:attribute name="isReference" use="optional" type="xsd:boolean" >
-								</xsd:attribute>
-								<xsd:attribute name="derivation_pattern" use="optional" type="xsd:string"/>
-								<xsd:attribute name="db_codes" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="schema_codes" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="nil_value" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="nil_reason" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="for_each_select_id" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="select_id" use="optional" type="xsd:string">
-								</xsd:attribute>
-							</xsd:extension>
-						</xsd:simpleContent>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="Join">
-					<xsd:complexType>
-						<xsd:simpleContent>
-							<xsd:extension base="xsd:string">
-								<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-								<xsd:attribute name="target" use="optional" type="xsd:string" default="">
-								</xsd:attribute>
-								<xsd:attribute name="filter_mapping" type="xsd:boolean" use="optional" default="false">
-								</xsd:attribute>
-								<xsd:attribute name="join_path" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="axis" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="idref" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="match" use="optional" type="xsd:string">
-								</xsd:attribute>
-								<xsd:attribute name="disambiguate" use="optional" type="xsd:string">
-								</xsd:attribute>
-							</xsd:extension>
-						</xsd:simpleContent>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="AssociationTarget">
-					<xsd:complexType>
-						<xsd:simpleContent>
-							<xsd:extension base="xsd:string">
-								<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-								<xsd:attribute name="target" use="optional" type="xsd:string" default="">
-								</xsd:attribute>
-								<xsd:attribute name="object_ref" type="xsd:string" use="optional">
-								</xsd:attribute>
-							</xsd:extension>
-						</xsd:simpleContent>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="Content">
-					<xsd:complexType>
-						<xsd:simpleContent>
-							<xsd:extension base="xsd:string">
-								<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-								<xsd:attribute name="target" use="optional" type="xsd:string" default="">
-								</xsd:attribute>
-								<xsd:attribute name="representation" type="xsd:string" use="optional">
-								</xsd:attribute>
-								<xsd:attribute name="implementation" type="xsd:string" use="optional">
-								</xsd:attribute>
-								<xsd:attribute name="mode" type="xsd:string" use="optional">
-								</xsd:attribute>
-							</xsd:extension>
-						</xsd:simpleContent>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="Substitution">
-					<xsd:complexType>
-						<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-						<xsd:attribute name="target" use="optional" type="xsd:string" default="">
-						</xsd:attribute>
-						<xsd:attribute name="implementation" type="xsd:string" use="optional">
-						</xsd:attribute>
-					</xsd:complexType>
-				</xsd:element>
-			</xsd:choice>
-		</xsd:sequence>
-	</xsd:complexType>
-	<xsd:element name="Mappings" type="xtraSrv:MappingsSequenceType"/>
-<xsd:complexType name="SQLFeatureTypeImplType">
-		<xsd:complexContent>
-			<xsd:extension base="xtraSrv:MappingsSequenceType">
-				<xsd:attribute name="logging" use="optional" default="false">
-					<xsd:simpleType>
-						<xsd:union memberTypes="xsd:boolean xtraSrv:loggingExtensionType  "/>
-					</xsd:simpleType>
-				</xsd:attribute>
-				<xsd:attribute name="useTempTable" type="xsd:boolean" use="optional" default="false">
-				</xsd:attribute>
-				<xsd:attribute name="tempTableName" type="xsd:string" use="optional">
-				</xsd:attribute>
-				<xsd:attribute name="FTCode" type="xsd:string" use="optional">
-				</xsd:attribute>
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-<xsd:element name="FeatureType">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element ref="xtraSrv:Name" minOccurs="0"/>
-				<xsd:element ref="xtraSrv:Title" minOccurs="0"/>
-				<xsd:element name="Abstract" type="xsd:string" minOccurs="0"/>
-				<xsd:element name="Keyword" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xsd:element name="OutputFormat" minOccurs="0" maxOccurs="unbounded">
-					<xsd:complexType>
-						<xsd:simpleContent>
-							<xsd:extension base="xsd:string">
-								<xsd:attribute name="wfsVersion" type="xsd:string"/>
-							</xsd:extension>
-						</xsd:simpleContent>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:element name="SuppressIdentity" type="xsd:boolean" minOccurs="0">
-				</xsd:element>
-				<xsd:element name="PathAliases" minOccurs="0">
-					<xsd:complexType>
-						<xsd:sequence>
-							<xsd:element name="PathAlias" minOccurs="0" maxOccurs="unbounded">
-								<xsd:complexType>
-									<xsd:sequence>
-										<xsd:element name="Pattern" type="xsd:string"/>
-										<xsd:element name="Replacement" type="xsd:string"/>
-									</xsd:sequence>
-									<xsd:attribute name="externalUse" type="xsd:boolean" use="optional" default="false"/>
-									<xsd:attribute name="gmlVersion" type="xsd:string" use="optional"/>
-								</xsd:complexType>
-							</xsd:element>
-						</xsd:sequence>
-					</xsd:complexType>
-				</xsd:element>
-				<xsd:choice>
-					<xsd:element ref="xtraSrv:OraSFeatureTypeImpl" minOccurs="0"/>
-					<xsd:element ref="xtraSrv:PGISFeatureTypeImpl" minOccurs="0"/>
-					<xsd:element ref="xtraSrv:GDBSQLFeatureTypeImpl" minOccurs="0"/>
-					<!-- später mehr ... -->
-				</xsd:choice>
-			</xsd:sequence>
-			<xsd:attribute name="includeDerivations" type="xsd:boolean" use="optional" default="false">
-			</xsd:attribute>
-			<xsd:attribute name="mode" type="xtraSrv:EnablingType" use="optional" default="enabled"/>
-		</xsd:complexType>
-	</xsd:element>
-	<xsd:element name="AdditionalMappings">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="RootElementName" type="xsd:string"/>
-				<xsd:element ref="xtraSrv:Mappings"/>
-			</xsd:sequence>
-		</xsd:complexType>
-	</xsd:element>
-<xsd:element name="PGISFeatureTypeImpl" type="xtraSrv:SQLFeatureTypeImplType">
-	</xsd:element>
-<xsd:element name="GDBSQLFeatureTypeImpl" type="xtraSrv:SQLFeatureTypeImplType">
-	</xsd:element>
-<xsd:element name="OraSFeatureTypeImpl" type="xtraSrv:SQLFeatureTypeImplType">
-	</xsd:element>
-<xsd:element name="FeatureTypes">
-							<xsd:complexType>
-								<xsd:choice minOccurs="0" maxOccurs="unbounded">
-									<xsd:element ref="xtraSrv:FeatureType"/>
-									<xsd:element ref="xtraSrv:AdditionalMappings"/>
-								</xsd:choice>
-								<xsd:attribute name="defaultDbSchema" type="xsd:string" use="optional"/>
-								<xsd:attribute name="appSchemaGenerator" type="xsd:IDREF" use="optional"/>
-							</xsd:complexType>
-						</xsd:element>
-<xsd:simpleType name="EnablingType">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="enabled"/>
-			<xsd:enumeration value="disabled"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-<xsd:simpleType name="loggingExtensionType">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="short"/>
-		</xsd:restriction>
-	</xsd:simpleType>
-<xsd:element name="Name" type="xsd:string"/>
-	<xsd:element name="Title" type="xsd:string"/>
-</xsd:schema>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-db-hale-schema b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-db-hale-schema
deleted file mode 100644
index 6fb3e4e807..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-db-hale-schema
+++ /dev/null
@@ -1,739 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><hsd:schemas xmlns:hsd="http://www.esdi-humboldt.eu/hale/schema">
-<hsd:schema namespace="jdbc:postgresql:simpledemo_doc">
-<hsd:type-index>
-<hsd:entry index="0">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">alternativename</hsd:name>
-</hsd:entry>
-<hsd:entry index="1">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">city</hsd:name>
-</hsd:entry>
-<hsd:entry index="2">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">city_river</hsd:name>
-</hsd:entry>
-<hsd:entry index="3">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">district</hsd:name>
-</hsd:entry>
-<hsd:entry index="4">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">geography_columns</hsd:name>
-</hsd:entry>
-<hsd:entry index="5">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/city/location">geometry</hsd:name>
-</hsd:entry>
-<hsd:entry index="6">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/district/location">geometry</hsd:name>
-</hsd:entry>
-<hsd:entry index="7">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/river/location">geometry</hsd:name>
-</hsd:entry>
-<hsd:entry index="8">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/state/location">geometry</hsd:name>
-</hsd:entry>
-<hsd:entry index="9">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">geometry_columns</hsd:name>
-</hsd:entry>
-<hsd:entry index="10">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">int2</hsd:name>
-</hsd:entry>
-<hsd:entry index="11">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">int4</hsd:name>
-</hsd:entry>
-<hsd:entry index="12">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">name</hsd:name>
-</hsd:entry>
-<hsd:entry index="13">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">river</hsd:name>
-</hsd:entry>
-<hsd:entry index="14">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">spatial_ref_sys</hsd:name>
-</hsd:entry>
-<hsd:entry index="15">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">state</hsd:name>
-</hsd:entry>
-<hsd:entry index="16">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">text</hsd:name>
-</hsd:entry>
-<hsd:entry index="17">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">varchar</hsd:name>
-</hsd:entry>
-</hsd:type-index>
-<hsd:mapping-relevant>0 1 2 3 4 9 13 14 15</hsd:mapping-relevant>
-<hsd:types>
-<hsd:type index="0">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">alternativename</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."alternativename"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="alternativename"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>cid</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>name</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>language</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="1">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">city</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."city"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="city"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:description>Internal Id.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>name</hsd:name>
-<hsd:description>Name of the City. May be missing.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>inhabitants</hsd:name>
-<hsd:description>Number of inhabitants.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>location</hsd:name>
-<hsd:description>Point location of the City.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="5"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>function</hsd:name>
-<hsd:description>Function of the City. May be Nil.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="2">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">city_river</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."city_river"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="city_river"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:description>id of intermediary table row.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>cid</hsd:name>
-<hsd:description>Pointer to City row.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>rid</hsd:name>
-<hsd:description>Pointer to River row.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="3">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">district</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."district"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="district"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:description>id of District object</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>cid</hsd:name>
-<hsd:description>Pointer to City the District belongs to.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>name</hsd:name>
-<hsd:description>Name of District. May be missing.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>location</hsd:name>
-<hsd:description>Point location of District.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="6"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="4">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">geography_columns</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."geography_columns"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="geography_columns"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:declares>
-<hsd:property>
-<hsd:name>f_table_catalog</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="12"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_table_schema</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="12"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_table_name</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="12"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_geography_column</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="12"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>coord_dimension</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>srid</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>type</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="16"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="5">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/city/location">geometry</hsd:name>
-<hsd:constraint type="binding" value="eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty"/>
-<hsd:constraint type="geometry-metadata">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="srsText">
-<core:value value="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]"/>
-</core:property>
-<core:property name="srs">
-<core:value value="4326"/>
-</core:property>
-<core:property name="authName">
-<core:value value="EPSG"/>
-</core:property>
-<core:property name="dimension">
-<core:value value="2"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="geometry-type" value="org.locationtech.jts.geom.Point"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="1111"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="6">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/district/location">geometry</hsd:name>
-<hsd:constraint type="binding" value="eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty"/>
-<hsd:constraint type="geometry-metadata">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="srsText">
-<core:value value="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]"/>
-</core:property>
-<core:property name="srs">
-<core:value value="4326"/>
-</core:property>
-<core:property name="authName">
-<core:value value="EPSG"/>
-</core:property>
-<core:property name="dimension">
-<core:value value="2"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="geometry-type" value="org.locationtech.jts.geom.Point"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="1111"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="7">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/river/location">geometry</hsd:name>
-<hsd:constraint type="binding" value="eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty"/>
-<hsd:constraint type="geometry-metadata">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="srsText">
-<core:value value="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]"/>
-</core:property>
-<core:property name="srs">
-<core:value value="4326"/>
-</core:property>
-<core:property name="authName">
-<core:value value="EPSG"/>
-</core:property>
-<core:property name="dimension">
-<core:value value="2"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="geometry-type" value="org.locationtech.jts.geom.Geometry"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="1111"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="8">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public/state/location">geometry</hsd:name>
-<hsd:constraint type="binding" value="eu.esdihumboldt.hale.common.schema.geometry.GeometryProperty"/>
-<hsd:constraint type="geometry-metadata">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="srsText">
-<core:value value="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]"/>
-</core:property>
-<core:property name="srs">
-<core:value value="4326"/>
-</core:property>
-<core:property name="authName">
-<core:value value="EPSG"/>
-</core:property>
-<core:property name="dimension">
-<core:value value="2"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="geometry-type" value="org.locationtech.jts.geom.Polygon"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="1111"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="9">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">geometry_columns</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."geometry_columns"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="geometry_columns"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:declares>
-<hsd:property>
-<hsd:name>f_table_catalog</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_table_schema</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_table_name</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>f_geometry_column</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>coord_dimension</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>srid</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>type</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="10">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">int2</hsd:name>
-<hsd:constraint type="binding" value="java.lang.Short"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="5"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="11">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">int4</hsd:name>
-<hsd:constraint type="binding" value="java.lang.Integer"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="4"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="12">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">name</hsd:name>
-<hsd:constraint type="binding" value="java.lang.String"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="12"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="13">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">river</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."river"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="river"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:description>id of River object.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>name</hsd:name>
-<hsd:description>Name of River object. May be missing.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>length</hsd:name>
-<hsd:description>Length of River in km.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>location</hsd:name>
-<hsd:description>Line geometry of River.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="7"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="14">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">spatial_ref_sys</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."spatial_ref_sys"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="spatial_ref_sys"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>srid</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>srid</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>auth_name</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>auth_srid</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="11"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>srtext</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>proj4text</hsd:name>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="15">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc:public">state</hsd:name>
-<hsd:constraint type="abstract" value="false"/>
-<hsd:constraint type="has-value" value="false"/>
-<hsd:constraint type="jdbc_sqlquery">
-<core:text xml:space="preserve" xmlns:core="http://www.esdi-humboldt.eu/hale/core">SELECT * FROM "public"."state"</core:text>
-</hsd:constraint>
-<hsd:constraint type="jdbc_table">
-<core:properties xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:property name="schema">
-<core:value value="public"/>
-</core:property>
-<core:property name="usequote">
-<core:value value="true"/>
-</core:property>
-<core:property name="table">
-<core:value value="state"/>
-</core:property>
-</core:properties>
-</hsd:constraint>
-<hsd:constraint type="mappable" value="true"/>
-<hsd:constraint type="mapping-relevant" value="true"/>
-<hsd:constraint type="primary-key">
-<core:list xmlns:core="http://www.esdi-humboldt.eu/hale/core">
-<core:entry>
-<core:name>id</core:name>
-</core:entry>
-</core:list>
-</hsd:constraint>
-<hsd:declares>
-<hsd:property>
-<hsd:name>id</hsd:name>
-<hsd:description>id of State object.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="false"/>
-<hsd:propertyType index="10"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>name</hsd:name>
-<hsd:description>Name of State object. May be missing.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="17"/>
-</hsd:property>
-<hsd:property>
-<hsd:name>location</hsd:name>
-<hsd:description>Area geometry of State object.</hsd:description>
-<hsd:constraint type="cardinality" value="1..1"/>
-<hsd:constraint type="nillable" value="true"/>
-<hsd:propertyType index="8"/>
-</hsd:property>
-</hsd:declares>
-</hsd:type>
-<hsd:type index="16">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">text</hsd:name>
-<hsd:constraint type="binding" value="java.lang.String"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="12"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-<hsd:type index="17">
-<hsd:name namespace="jdbc:postgresql:simpledemo_doc">varchar</hsd:name>
-<hsd:constraint type="binding" value="java.lang.String"/>
-<hsd:constraint type="has-value" value="true"/>
-<hsd:constraint type="jdbc_sqltype" value="12"/>
-<hsd:constraint type="mapping-relevant" value="false"/>
-</hsd:type>
-</hsd:types>
-</hsd:schema>
-</hsd:schemas>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping-flattened.xml b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping-flattened.xml
deleted file mode 100644
index ced4d8d906..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping-flattened.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-	This file is a part of XtraServer SimpleDemo configuration
-	
-	Copyright (c) 2012-2014, interactive instruments GmbH
--->
-
-<!--GML/DB-Mapping-->
-<FeatureTypes xmlns="http://www.interactive-instruments.de/namespaces/XtraServer">
-
-	<FeatureType>
-		<Name>gml:AbstractFeature</Name>
-		<PGISFeatureTypeImpl>
-			<!--City-->
-			<Table oid_col="id" table_name="city" target=""/>
-			<Table table_name="city" target="@gml:id" value="objid"/>
-			<!--River-->
-			<Table oid_col="id" table_name="river" target=""/>
-			<Table table_name="river" target="@gml:id" value="objid"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:NamedGeoObject</Name>
-		<PGISFeatureTypeImpl>
-			<!--City-->
-			<Table table_name="city" oid_col="id" target=""/>
-			<Table table_name="city" value="name" target="ci:name"/>
-			<!--River-->
-			<Table table_name="river" oid_col="id" target=""/>
-			<Table table_name="river" value="name" target="ci:name"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:City</Name>
-		<PGISFeatureTypeImpl>
-			<!-- Main table of feature type City -->
-			<Table table_name="city" oid_col="id" target=""/>
-
-			<!-- location -->
-			<Table table_name="city" value="location" target="ci:location"/>
-
-			<!-- country -->
-			<Table table_name="city" value="Germany" value_type="constant" target="ci:country"/>
-
-			<!-- function : nillable property -->
-			<Table table_name="city" value="'urn:ci:function::' || $T$.function" target="ci:function"/>
-			<Table table_name="city" value="function" mapping_mode="nil" db_codes="1 2 3 NULL" schema_codes="'unknown' 'other:unpopulated' 'withheld'" target="ci:function"/>
-
-			<!-- alternativeName : DataType of multiple occurrence -->
-			<Join target="ci:alternativeName" axis="parent" join_path="alternativename/ref(cid:id)::city"/>
-			<Table table_name="alternativename" oid_col="id" target="ci:alternativeName"/>
-			<Table table_name="alternativename" value="name" target="ci:alternativeName/ci:AlternativeName/ci:name"/>
-			<Table table_name="alternativename" value="language" target="ci:alternativeName/ci:AlternativeName/ci:language"/>
-
-
-			<!-- river : FeatureType, multiple occurrence linked by reference -->
-			<Join target="ci:passingRiver" axis="parent" join_path="river/ref(id:rid)::city_river/ref(cid:id)::city"/>
-			<Table table_name="river" oid_col="id" target="ci:passingRiver"/>
-			<Table table_name="river" target="ci:passingRiver/@xlink:href"/>
-			<AssociationTarget object_ref="ci:River" target="ci:passingRiver"/>
-
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:River</Name>
-		<PGISFeatureTypeImpl>
-			<!-- Main table of feature type River -->
-			<Table table_name="river" oid_col="id" target=""/>
-			<!-- location -->
-			<Table table_name="river" value="location" target="ci:location"/>
-			<!-- length -->
-			<Table table_name="river" value="length" target="ci:length"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-</FeatureTypes>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping.xml b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping.xml
deleted file mode 100644
index d304edb04c..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/cities-mapping.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-	This file is a part of XtraServer SimpleDemo configuration
-
-	Copyright (c) 2012-2014, interactive instruments GmbH
--->
-
-<!--GML/DB-Mapping-->
-<FeatureTypes xmlns="http://www.interactive-instruments.de/namespaces/XtraServer">
-
-	<FeatureType>
-		<Name>gml:AbstractFeature</Name>
-		<PGISFeatureTypeImpl>
-			<!--City-->
-			<Table oid_col="id" table_name="city" target=""/>
-			<Table table_name="city" target="@gml:id" value="objid"/>
-			<!--River-->
-			<Table oid_col="id" table_name="river" target=""/>
-			<Table table_name="river" target="@gml:id" value="objid"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:NamedGeoObject</Name>
-		<PGISFeatureTypeImpl>
-			<!--City-->
-			<Table table_name="city" oid_col="id" target=""/>
-			<Table table_name="city" value="name" target="ci:name"/>
-			<!--River-->
-			<Table table_name="river" oid_col="id" target=""/>
-			<Table table_name="river" value="name" target="ci:name"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:City</Name>
-		<PGISFeatureTypeImpl>
-			<!-- Main table of feature type City -->
-			<Table table_name="city" oid_col="id" target=""/>
-
-			<!-- location -->
-			<Table table_name="city" value="location" target="ci:location"/>
-
-			<!-- country -->
-			<Table table_name="city" value="Germany" value_type="constant" target="ci:country"/>
-
-			<!-- function : nillable property -->
-			<Table table_name="city" value="'urn:ci:function::' || $T$.function" target="ci:function" value_type="expression"/>
-			<Table table_name="city" value="function" mapping_mode="nil" db_codes="1 2 3 NULL" schema_codes="'unknown' 'other:unpopulated' 'withheld'" target="ci:function"/>
-
-			<!-- alternativeName : DataType of multiple occurrence -->
-			<Join target="ci:alternativeName" axis="parent" join_path="alternativename/ref(cid:id)::city"/>
-			<Table table_name="alternativename" oid_col="id" target="ci:alternativeName"/>
-			<Table table_name="alternativename" value="name" target="ci:alternativeName/ci:AlternativeName/ci:name"/>
-			<Table table_name="alternativename" value="language" target="ci:alternativeName/ci:AlternativeName/ci:language"/>
-
-
-			<!-- river : FeatureType, multiple occurrence linked by reference -->
-			<Join target="ci:passingRiver" axis="parent" join_path="river/ref(id:rid)::city_river/ref(cid:id)::city"/>
-			<Table table_name="river" oid_col="id" target="ci:passingRiver"/>
-			<Table table_name="river" target="ci:passingRiver/@xlink:href"/>
-			<AssociationTarget object_ref="ci:River" target="ci:passingRiver"/>
-
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-	<FeatureType>
-		<Name>ci:River</Name>
-		<PGISFeatureTypeImpl>
-			<!-- Main table of feature type River -->
-			<Table table_name="river" oid_col="id" target=""/>
-			<!-- location -->
-			<Table table_name="river" value="location" target="ci:location"/>
-			<!-- length -->
-			<Table table_name="river" value="length" target="ci:length"/>
-		</PGISFeatureTypeImpl>
-	</FeatureType>
-
-</FeatureTypes>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/simpledemo.halez b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/simpledemo.halez
deleted file mode 100755
index 61d57154a2..0000000000
Binary files a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/data/simpledemo.halez and /dev/null differ
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriterTest.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriterTest.java
deleted file mode 100644
index 084be1f889..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver.test/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriterTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-
-import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.google.common.io.Files;
-
-import de.fhg.igd.slf4jplus.ALogger;
-import de.fhg.igd.slf4jplus.ALoggerFactory;
-import eu.esdihumboldt.hale.common.align.io.impl.AbstractAlignmentWriter;
-import eu.esdihumboldt.hale.common.align.model.Alignment;
-import eu.esdihumboldt.hale.common.core.HalePlatform;
-import eu.esdihumboldt.hale.common.core.io.IOProvider;
-import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
-import eu.esdihumboldt.hale.common.core.io.impl.LogProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.project.ProjectInfo;
-import eu.esdihumboldt.hale.common.core.io.project.ProjectInfoAware;
-import eu.esdihumboldt.hale.common.core.io.project.model.Project;
-import eu.esdihumboldt.hale.common.core.io.report.IOReport;
-import eu.esdihumboldt.hale.common.core.io.supplier.FileIOSupplier;
-import eu.esdihumboldt.hale.common.headless.impl.ProjectTransformationEnvironment;
-import eu.esdihumboldt.hale.common.headless.test.AbstractProjectTest;
-import eu.esdihumboldt.hale.common.instance.io.InstanceReader;
-import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-
-@SuppressWarnings("javadoc")
-public class XtraServerMappingFileWriterTest extends AbstractProjectTest {
-
-	private static final ALogger log = ALoggerFactory
-			.getLogger(XtraServerMappingFileWriterTest.class);
-
-	private static final String PROJECT_LOCATION = "/data/simpledemo.halez";
-
-	private SchemaSpace sourceSchemaSpace;
-	private SchemaSpace targetSchemaSpace;
-
-	private Project project;
-	private Alignment alignment;
-	private File tempDir;
-
-	@Before
-	public void loadTestProject() {
-		try {
-			URL archiveLocation = XtraServerMappingFileWriterTest.class
-					.getResource(PROJECT_LOCATION);
-			assertNotNull(archiveLocation);
-			ProjectTransformationEnvironment projectTransformationEnvironment = this
-					.getProject(archiveLocation);
-
-			this.project = projectTransformationEnvironment.getProject();
-			this.alignment = projectTransformationEnvironment.getAlignment();
-			this.sourceSchemaSpace = projectTransformationEnvironment.getSourceSchema();
-			this.targetSchemaSpace = projectTransformationEnvironment.getTargetSchema();
-			this.tempDir = Files.createTempDir();
-
-		} catch (Exception e) {
-			log.error("Exception occurred", e);
-			fail("Test project could not be loaded: " + e.getMessage());
-		}
-	}
-
-	@After
-	public void cleanUp() throws IOException {
-		if (tempDir != null && tempDir.exists()) {
-			FileUtils.deleteDirectory(tempDir);
-		}
-	}
-
-	@Test
-	public void testProject() {
-		assertNotNull(project);
-		assertNotNull(alignment);
-		assertEquals(2, alignment.getTypeCells().size());
-	}
-
-	@Test
-	public void testWriteMappingFile() throws Exception {
-
-		final File targetFile = File.createTempFile(Long.toString(System.currentTimeMillis()),
-				".xml", tempDir);
-
-		try {
-			writeAlignment(targetFile, XtraServerMappingFileWriter.CONTENT_TYPE_MAPPING);
-
-			assertTrue(targetFile.exists());
-			assertTrue(targetFile.length() > 0);
-		} finally {
-			if (targetFile != null)
-				targetFile.delete();
-		}
-
-	}
-
-	@Test
-	public void testWriteArchive() throws Exception {
-
-		final File targetFile = File.createTempFile(Long.toString(System.currentTimeMillis()),
-				".zip", tempDir);
-
-		try {
-			writeAlignment(targetFile, XtraServerMappingFileWriter.CONTENT_TYPE_ARCHIVE);
-
-			assertTrue(targetFile.exists());
-			assertTrue(targetFile.length() > 0);
-		} finally {
-			if (targetFile != null)
-				targetFile.delete();
-		}
-
-	}
-
-	private void writeAlignment(File targetFile, String contentType)
-			throws IOException, IOProviderConfigurationException {
-		AbstractAlignmentWriter alignWriter = new XtraServerMappingFileWriter();
-		prepareProvider(alignWriter, project, tempDir.toURI());
-		alignWriter.setAlignment(alignment);
-		alignWriter.setSourceSchema(sourceSchemaSpace);
-		alignWriter.setTargetSchema(targetSchemaSpace);
-		alignWriter.setTarget(new FileIOSupplier(targetFile));
-		alignWriter
-				.setContentType(HalePlatform.getContentTypeManager().getContentType(contentType));
-
-		IOReport report = alignWriter.execute(new LogProgressIndicator());
-		assertNotNull(report);
-		assertTrue(report.isSuccess());
-	}
-
-	// adapted from DefaultIOAdvisor and subclasses
-	private void prepareProvider(IOProvider provider, ProjectInfo projectInfo,
-			URI projectLocation) {
-		if (provider instanceof ProjectInfoAware) {
-			ProjectInfoAware pia = (ProjectInfoAware) provider;
-			pia.setProjectInfo(projectInfo);
-			pia.setProjectLocation(projectLocation);
-		}
-		if (provider instanceof InstanceReader) {
-			InstanceReader ir = (InstanceReader) provider;
-			ir.setSourceSchema(sourceSchemaSpace);
-		}
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/edu.umd.cs.findbugs.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/edu.umd.cs.findbugs.core.prefs
deleted file mode 100644
index 33d36c417c..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/edu.umd.cs.findbugs.core.prefs
+++ /dev/null
@@ -1,132 +0,0 @@
-#Created from default preferences 12-mag-2015 16.01.18
-#Tue May 12 16:01:18 CEST 2015
-cloud_id=edu.umd.cs.findbugs.cloud.doNothingCloud
-detectorAppendingToAnObjectOutputStream=AppendingToAnObjectOutputStream|true
-detectorAtomicityProblem=AtomicityProblem|true
-detectorBadAppletConstructor=BadAppletConstructor|false
-detectorBadResultSetAccess=BadResultSetAccess|true
-detectorBadSyntaxForRegularExpression=BadSyntaxForRegularExpression|true
-detectorBadUseOfReturnValue=BadUseOfReturnValue|true
-detectorBadlyOverriddenAdapter=BadlyOverriddenAdapter|true
-detectorBooleanReturnNull=BooleanReturnNull|true
-detectorCallToUnsupportedMethod=CallToUnsupportedMethod|true
-detectorCheckExpectedWarnings=CheckExpectedWarnings|false
-detectorCheckImmutableAnnotation=CheckImmutableAnnotation|true
-detectorCheckTypeQualifiers=CheckTypeQualifiers|true
-detectorCloneIdiom=CloneIdiom|true
-detectorComparatorIdiom=ComparatorIdiom|true
-detectorConfusedInheritance=ConfusedInheritance|true
-detectorConfusionBetweenInheritedAndOuterMethod=ConfusionBetweenInheritedAndOuterMethod|true
-detectorCrossSiteScripting=CrossSiteScripting|true
-detectorDefaultEncodingDetector=DefaultEncodingDetector|true
-detectorDoInsideDoPrivileged=DoInsideDoPrivileged|true
-detectorDontCatchIllegalMonitorStateException=DontCatchIllegalMonitorStateException|true
-detectorDontIgnoreResultOfPutIfAbsent=DontIgnoreResultOfPutIfAbsent|true
-detectorDontUseEnum=DontUseEnum|true
-detectorDroppedException=DroppedException|true
-detectorDumbMethodInvocations=DumbMethodInvocations|true
-detectorDumbMethods=DumbMethods|true
-detectorDuplicateBranches=DuplicateBranches|true
-detectorEmptyZipFileEntry=EmptyZipFileEntry|true
-detectorEqualsOperandShouldHaveClassCompatibleWithThis=EqualsOperandShouldHaveClassCompatibleWithThis|true
-detectorExplicitSerialization=ExplicitSerialization|true
-detectorFinalizerNullsFields=FinalizerNullsFields|true
-detectorFindBadCast2=FindBadCast2|true
-detectorFindBadForLoop=FindBadForLoop|true
-detectorFindCircularDependencies=FindCircularDependencies|false
-detectorFindDeadLocalStores=FindDeadLocalStores|true
-detectorFindDoubleCheck=FindDoubleCheck|true
-detectorFindEmptySynchronizedBlock=FindEmptySynchronizedBlock|true
-detectorFindFieldSelfAssignment=FindFieldSelfAssignment|true
-detectorFindFinalizeInvocations=FindFinalizeInvocations|true
-detectorFindFloatEquality=FindFloatEquality|true
-detectorFindHEmismatch=FindHEmismatch|true
-detectorFindInconsistentSync2=FindInconsistentSync2|true
-detectorFindJSR166LockMonitorenter=FindJSR166LockMonitorenter|true
-detectorFindLocalSelfAssignment2=FindLocalSelfAssignment2|true
-detectorFindMaskedFields=FindMaskedFields|true
-detectorFindMismatchedWaitOrNotify=FindMismatchedWaitOrNotify|true
-detectorFindNakedNotify=FindNakedNotify|true
-detectorFindNonShortCircuit=FindNonShortCircuit|true
-detectorFindNullDeref=FindNullDeref|true
-detectorFindNullDerefsInvolvingNonShortCircuitEvaluation=FindNullDerefsInvolvingNonShortCircuitEvaluation|true
-detectorFindOpenStream=FindOpenStream|true
-detectorFindPuzzlers=FindPuzzlers|true
-detectorFindRefComparison=FindRefComparison|true
-detectorFindReturnRef=FindReturnRef|true
-detectorFindRunInvocations=FindRunInvocations|true
-detectorFindSelfComparison=FindSelfComparison|true
-detectorFindSelfComparison2=FindSelfComparison2|true
-detectorFindSleepWithLockHeld=FindSleepWithLockHeld|true
-detectorFindSpinLoop=FindSpinLoop|true
-detectorFindSqlInjection=FindSqlInjection|true
-detectorFindTwoLockWait=FindTwoLockWait|true
-detectorFindUncalledPrivateMethods=FindUncalledPrivateMethods|true
-detectorFindUnconditionalWait=FindUnconditionalWait|true
-detectorFindUninitializedGet=FindUninitializedGet|true
-detectorFindUnrelatedTypesInGenericContainer=FindUnrelatedTypesInGenericContainer|true
-detectorFindUnreleasedLock=FindUnreleasedLock|true
-detectorFindUnsatisfiedObligation=FindUnsatisfiedObligation|true
-detectorFindUnsyncGet=FindUnsyncGet|true
-detectorFindUseOfNonSerializableValue=FindUseOfNonSerializableValue|true
-detectorFindUselessControlFlow=FindUselessControlFlow|true
-detectorFormatStringChecker=FormatStringChecker|true
-detectorHugeSharedStringConstants=HugeSharedStringConstants|true
-detectorIDivResultCastToDouble=IDivResultCastToDouble|true
-detectorIncompatMask=IncompatMask|true
-detectorInconsistentAnnotations=InconsistentAnnotations|true
-detectorInefficientMemberAccess=InefficientMemberAccess|false
-detectorInefficientToArray=InefficientToArray|true
-detectorInfiniteLoop=InfiniteLoop|true
-detectorInfiniteRecursiveLoop=InfiniteRecursiveLoop|true
-detectorInheritanceUnsafeGetResource=InheritanceUnsafeGetResource|true
-detectorInitializationChain=InitializationChain|true
-detectorInitializeNonnullFieldsInConstructor=InitializeNonnullFieldsInConstructor|true
-detectorInstantiateStaticClass=InstantiateStaticClass|true
-detectorIntCast2LongAsInstant=IntCast2LongAsInstant|true
-detectorInvalidJUnitTest=InvalidJUnitTest|true
-detectorIteratorIdioms=IteratorIdioms|true
-detectorLazyInit=LazyInit|true
-detectorLoadOfKnownNullValue=LoadOfKnownNullValue|true
-detectorLostLoggerDueToWeakReference=LostLoggerDueToWeakReference|true
-detectorMethodReturnCheck=MethodReturnCheck|true
-detectorMultithreadedInstanceAccess=MultithreadedInstanceAccess|true
-detectorMutableLock=MutableLock|true
-detectorMutableStaticFields=MutableStaticFields|true
-detectorNaming=Naming|true
-detectorNoteUnconditionalParamDerefs=NoteUnconditionalParamDerefs|true
-detectorNumberConstructor=NumberConstructor|true
-detectorOverridingEqualsNotSymmetrical=OverridingEqualsNotSymmetrical|true
-detectorPreferZeroLengthArrays=PreferZeroLengthArrays|true
-detectorPublicSemaphores=PublicSemaphores|true
-detectorQuestionableBooleanAssignment=QuestionableBooleanAssignment|true
-detectorReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass=ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass|true
-detectorReadReturnShouldBeChecked=ReadReturnShouldBeChecked|true
-detectorRedundantInterfaces=RedundantInterfaces|true
-detectorRepeatedConditionals=RepeatedConditionals|true
-detectorRuntimeExceptionCapture=RuntimeExceptionCapture|true
-detectorSerializableIdiom=SerializableIdiom|true
-detectorStartInConstructor=StartInConstructor|true
-detectorStaticCalendarDetector=StaticCalendarDetector|true
-detectorStringConcatenation=StringConcatenation|true
-detectorSuperfluousInstanceOf=SuperfluousInstanceOf|true
-detectorSuspiciousThreadInterrupted=SuspiciousThreadInterrupted|true
-detectorSwitchFallthrough=SwitchFallthrough|true
-detectorSynchronizeAndNullCheckField=SynchronizeAndNullCheckField|true
-detectorSynchronizeOnClassLiteralNotGetClass=SynchronizeOnClassLiteralNotGetClass|true
-detectorSynchronizingOnContentsOfFieldToProtectField=SynchronizingOnContentsOfFieldToProtectField|true
-detectorURLProblems=URLProblems|true
-detectorUncallableMethodOfAnonymousClass=UncallableMethodOfAnonymousClass|true
-detectorUnnecessaryMath=UnnecessaryMath|true
-detectorUnreadFields=UnreadFields|true
-detectorUselessSubclassMethod=UselessSubclassMethod|true
-detectorVarArgsProblems=VarArgsProblems|true
-detectorVolatileUsage=VolatileUsage|true
-detectorWaitInLoop=WaitInLoop|true
-detectorWrongMapIterator=WrongMapIterator|true
-detectorXMLFactoryBypass=XMLFactoryBypass|true
-detector_threshold=2
-effort=default
-filter_settings=Medium|BAD_PRACTICE,CORRECTNESS,I18N,MALICIOUS_CODE,MT_CORRECTNESS,PERFORMANCE,SECURITY,STYLE|false|15
-filter_settings_neg=NOISE,EXPERIMENTAL|
-run_at_full_build=false
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.core.resources.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8bd9f5c233..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created from default preferences 12-mag-2015 16.01.18
-#Tue May 12 16:01:18 CEST 2015
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.ui.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 46646fbb60..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,64 +0,0 @@
-#Updated from default preferences Jul 9, 2016 10:07:16 AM
-#Sat Jul 09 10:07:16 CEST 2016
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_HALE
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*\n * Copyright (c) ${year} wetransform GmbH\n * \n * All rights reserved. This program and the accompanying materials are made\n * available under the terms of the GNU Lesser General Public License as\n * published by the Free Software Foundation, either version 3 of the License,\n * or (at your option) any later version.\n * \n * You should have received a copy of the GNU Lesser General Public License\n * along with this distribution. If not, see &lt;http\://www.gnu.org/licenses/&gt;.\n * \n * Contributors\:\n *     wetransform GmbH &lt;http\://www.wetransform.to&gt;\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO Type description\n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="false" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.core.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index cca138bc6a..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Created from default preferences 12-mag-2015 16.01.18
-#Tue May 12 16:01:18 CEST 2015
-eclipse.preferences.version=1
-resolve.requirebundle=false
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.prefs b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fae5965fb0..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,36 +0,0 @@
-#Created from default preferences Jul 25, 2018 1:58:36 PM
-#Wed Jul 25 13:58:36 CEST 2018
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=2
-compilers.p.build=1
-compilers.p.build.bin.includes=1
-compilers.p.build.encodings=2
-compilers.p.build.java.compiler=2
-compilers.p.build.java.compliance=1
-compilers.p.build.missing.output=2
-compilers.p.build.output.library=1
-compilers.p.build.source.library=1
-compilers.p.build.src.includes=1
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.internal=1
-compilers.p.missing-packages=2
-compilers.p.missing-version-export-package=2
-compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
-compilers.p.no-required-att=0
-compilers.p.no.automatic.module=1
-compilers.p.not-externalized-att=2
-compilers.p.service.component.without.lazyactivation=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-identifier=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-eclipse.preferences.version=1
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/META-INF/MANIFEST.MF b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/META-INF/MANIFEST.MF
deleted file mode 100644
index bcd91c2e14..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,80 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: XtraServer Mapping I/O
-Bundle-SymbolicName: eu.esdihumboldt.hale.io.xtraserver;singleton:=true
-Bundle-Version: 4.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: interactive instruments GmbH
-Require-Bundle: eu.esdihumboldt.hale.common.instance,
- org.eclipse.core.runtime;bundle-version="3.6.0",
- eu.esdihumboldt.hale.common.align,
- org.apache.velocity;bundle-version="1.6.2",
- de.interactive_instruments.xtraserver-config-util;bundle-version="[1.0.0,1.1.0)",
- eu.esdihumboldt.hale.io.jdbc;bundle-version="3.4.0"
-Import-Package: com.google.common.base;version="17.0.0",
- com.google.common.collect;version="1.0.0",
- com.google.common.io;version="17.0.0",
- de.fhg.igd.eclipse.util.extension,
- de.fhg.igd.slf4jplus,
- eu.esdihumboldt.cst.functions.core,
- eu.esdihumboldt.cst.functions.geometric.extent,
- eu.esdihumboldt.cst.functions.groovy,
- eu.esdihumboldt.cst.functions.numeric,
- eu.esdihumboldt.cst.functions.string,
- eu.esdihumboldt.hale.common.align.extension.function,
- eu.esdihumboldt.hale.common.align.io.impl,
- eu.esdihumboldt.hale.common.align.io.impl.internal.generated;version="2.9.3",
- eu.esdihumboldt.hale.common.align.model,
- eu.esdihumboldt.hale.common.align.model.functions,
- eu.esdihumboldt.hale.common.align.model.impl,
- eu.esdihumboldt.hale.common.core,
- eu.esdihumboldt.hale.common.core.io,
- eu.esdihumboldt.hale.common.core.io.extension,
- eu.esdihumboldt.hale.common.core.io.impl,
- eu.esdihumboldt.hale.common.core.io.project,
- eu.esdihumboldt.hale.common.core.io.project.model,
- eu.esdihumboldt.hale.common.core.io.report,
- eu.esdihumboldt.hale.common.core.io.report.impl,
- eu.esdihumboldt.hale.common.core.io.supplier,
- eu.esdihumboldt.hale.common.core.report,
- eu.esdihumboldt.hale.common.core.service,
- eu.esdihumboldt.hale.common.filter,
- eu.esdihumboldt.hale.common.lookup,
- eu.esdihumboldt.hale.common.schema,
- eu.esdihumboldt.hale.common.schema.io,
- eu.esdihumboldt.hale.common.schema.io.impl,
- eu.esdihumboldt.hale.common.schema.model,
- eu.esdihumboldt.hale.common.schema.model.constraint,
- eu.esdihumboldt.hale.common.schema.model.constraint.property,
- eu.esdihumboldt.hale.common.schema.model.constraint.type,
- eu.esdihumboldt.hale.common.schema.model.impl,
- eu.esdihumboldt.hale.common.schema.model.impl.internal,
- eu.esdihumboldt.hale.common.schema.persist,
- eu.esdihumboldt.hale.io.xsd.constraint,
- eu.esdihumboldt.hale.io.xsd.model,
- eu.esdihumboldt.hale.io.xsd.reader.internal.constraint,
- eu.esdihumboldt.hale.util.nonosgi.contenttype.describer,
- eu.esdihumboldt.util.definition,
- eu.esdihumboldt.util.groovy.paths,
- eu.esdihumboldt.util.io,
- org.apache.commons.io;version="2.4.0",
- org.apache.commons.io.filefilter;version="2.4.0",
- org.apache.commons.lang;version="2.6.0",
- org.apache.http;version="4.3.2",
- org.apache.http.client;version="4.3.3",
- org.apache.http.client.fluent;version="4.3.6",
- org.apache.http.client.utils;version="4.3.6",
- org.apache.http.entity;version="4.3.3",
- org.apache.http.protocol;version="4.3.3",
- org.apache.http.util;version="4.3.3",
- org.apache.ws.commons.schema;version="1.4.7",
- org.apache.xmlbeans;version="2.4.0",
- org.geotools.filter;version="12.2.0.combined",
- org.geotools.filter.text.cql2,
- org.geotools.filter.visitor;version="12.2.0.combined",
- org.opengis.filter;version="12.2.0",
- org.opengis.filter.expression,
- org.slf4j;version="1.5.11"
-Export-Package: eu.esdihumboldt.hale.io.xtraserver.reader,
- eu.esdihumboldt.hale.io.xtraserver.writer
-Automatic-Module-Name: eu.esdihumboldt.hale.io.xtraserver
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/plugin.xml b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/plugin.xml
deleted file mode 100644
index 026c341137..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/plugin.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-	<!-- XtraServer Comptatibility -->
-   <extension
-         point="eu.esdihumboldt.hale.align.compatibility">
-      <compatibility
-            class="eu.esdihumboldt.hale.io.xtraserver.compatibility.XtraServerCompatibilityMode"
-            id="eu.esdihumboldt.hale.io.xtraserver.compatibility"
-            key="eu.esdihumboldt.hale.io.xtraserver.compatibility.xtraserver"
-            name="XtraServer">
-         <supportsFilter
-               ref="CQL">
-         </supportsFilter>
-         <supportsFilter
-               ref="ECQL">
-         </supportsFilter>
-      </compatibility>
-   </extension>
-   <extension
-         point="eu.esdihumboldt.hale.io.provider">
-      <!-- XtraServer Mapping File Reader -->   
-      <provider
-            class="eu.esdihumboldt.hale.io.xtraserver.reader.XtraServerMappingFileReader"
-            id="eu.esdihumboldt.hale.io.xtraserver.reader"
-            name="XtraServer Mapping File">
-         <contentType ref="eu.esdihumboldt.hale.io.xtraserver.mapping.xml" />
-      </provider>
-      <!-- XtraServer Mapping File Writer -->
-      <provider
-            class="eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingFileWriter"
-            id="eu.esdihumboldt.hale.io.xtraserver.writer"
-            name="XtraServer Mapping">
-         <contentType ref="eu.esdihumboldt.hale.io.xtraserver.mapping.xml" />
-         <contentType ref="eu.esdihumboldt.hale.io.xtraserver.mapping.archive"/>
-      </provider>
-   </extension>
-   <extension point="org.eclipse.core.contenttype.contentTypes">
-      <!-- XtraServer Mapping File XML Content Type -->   
-      <content-type
-            base-type="org.eclipse.core.runtime.xml"
-            file-extensions="xml"
-            id="eu.esdihumboldt.hale.io.xtraserver.mapping.xml"
-            name="XtraServer Mapping File"
-            priority="normal">
-         <describer
-               class="eu.esdihumboldt.hale.util.nonosgi.contenttype.describer.XMLRootElementContentDescriber2">
-            <parameter
-                  name="element"
-                  value="{http://www.interactive-instruments.de/namespaces/XtraServer}FeatureTypes">
-            </parameter>
-         </describer>
-      </content-type>
-      <!-- XtraServer Mapping Archive Content Type -->
-      <content-type 
-        file-extensions="zip"
-        id="eu.esdihumboldt.hale.io.xtraserver.mapping.archive"
-        name="XtraServer Mapping Archive"
-        priority="normal">
-      </content-type>
-   </extension>
-   <extension
-         point="eu.esdihumboldt.hale.align.category">
-      <category
-            id="eu.esdihumboldt.hale.io.xtraserver.functions"
-            name="XtraServer">
-      </category>
-   </extension>
-   <extension
-         point="eu.esdihumboldt.hale.align.function">
-      <propertyFunction
-            category="eu.esdihumboldt.hale.io.xtraserver.functions"
-            identifier="eu.esdihumboldt.hale.io.xtraserver.sqlExpression"
-            name="SQL Expression">
-         <targetProperties>
-            <property
-                  eager="false"
-                  maxOccurrence="1"
-                  minOccurrence="1">
-            </property>
-         </targetProperties>
-         <sourceProperties>
-            <property
-                  eager="false"
-                  maxOccurrence="n"
-                  minOccurrence="0">
-            </property>
-         </sourceProperties>
-         <functionParameter
-               deprecated="false"
-               maxOccurrence="1"
-               minOccurrence="1"
-               name="sql"
-               scriptable="false">
-            <parameterBinding
-                  class="java.lang.String">
-            </parameterBinding>
-         </functionParameter>
-      </propertyFunction>
-   </extension>
-</plugin>
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/compatibility/XtraServerCompatibilityMode.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/compatibility/XtraServerCompatibilityMode.java
deleted file mode 100644
index b29b6ac918..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/compatibility/XtraServerCompatibilityMode.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.compatibility;
-
-import com.google.common.collect.ListMultimap;
-
-import de.fhg.igd.slf4jplus.ALogger;
-import de.fhg.igd.slf4jplus.ALoggerFactory;
-import eu.esdihumboldt.hale.common.align.compatibility.CompatibilityMode;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ChildContext;
-import eu.esdihumboldt.hale.common.align.model.Condition;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.core.service.ServiceProvider;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.PropertyTransformationHandler;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler;
-
-/**
- * Compatibility mode for XtraServer configuration mapping files
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class XtraServerCompatibilityMode implements CompatibilityMode {
-
-	private static final ALogger logger = ALoggerFactory
-			.getLogger(XtraServerCompatibilityMode.class);
-
-	/**
-	 * Check all supported functions by delegating to the Type and Property
-	 * Transformation Handlers
-	 * 
-	 * @see eu.esdihumboldt.hale.common.align.compatibility.CompatibilityMode#supportsFunction(java.lang.String,
-	 *      eu.esdihumboldt.hale.common.core.service.ServiceProvider)
-	 */
-	@Override
-	public boolean supportsFunction(final String functionId, ServiceProvider serviceProvider) {
-		boolean supported = TypeTransformationHandler.isTransformationSupported(functionId)
-				|| PropertyTransformationHandler.isTransformationSupported(functionId);
-		if (!supported) {
-			logger.debug("Function {} is not supported by the XtraServer plugin", supported);
-		}
-		return supported;
-	}
-
-	/**
-	 * Rejects filters
-	 * 
-	 * @see eu.esdihumboldt.hale.common.align.compatibility.CompatibilityMode#supportsCell(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public boolean supportsCell(Cell cell) {
-		final ListMultimap<String, ? extends Entity> entities = cell.getSource();
-		if (entities == null) {
-			return true;
-		}
-		if (hasFilters(entities)) {
-			logger.warn("Filters are not supported");
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Returns true if Filters are found in the entity definitions or the
-	 * property paths
-	 * 
-	 * @param entities entities to check
-	 * @return true if filters are found, false otherwise
-	 */
-	public static boolean hasFilters(final ListMultimap<String, ? extends Entity> entities) {
-		for (Entity entity : entities.values()) {
-			for (ChildContext context : entity.getDefinition().getPropertyPath()) {
-				final Condition cond = context.getCondition();
-				if (cond != null && cond.getFilter() != null) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/XtraServerMappingFileReader.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/XtraServerMappingFileReader.java
deleted file mode 100644
index 246b9707b3..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/XtraServerMappingFileReader.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import de.interactive_instruments.xtraserver.config.api.XtraServerMapping;
-import de.interactive_instruments.xtraserver.config.io.XtraServerMappingFile;
-import de.interactive_instruments.xtraserver.config.transformer.XtraServerMappingTransformer;
-import eu.esdihumboldt.hale.common.align.io.EntityResolver;
-import eu.esdihumboldt.hale.common.align.io.impl.AbstractAlignmentReader;
-import eu.esdihumboldt.hale.common.align.model.MutableAlignment;
-import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
-import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.common.core.io.report.impl.IOMessageImpl;
-import eu.esdihumboldt.hale.common.schema.model.Schema;
-import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-import eu.esdihumboldt.hale.common.schema.model.TypeIndex;
-import eu.esdihumboldt.hale.io.xtraserver.reader.handler.AlignmentGenerator;
-
-/**
- * Reads an XtraServer Mapping file into an Alignment .
- * 
- * @author zahnen
- */
-public class XtraServerMappingFileReader extends AbstractAlignmentReader {
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.core.io.IOProvider#isCancelable()
-	 */
-	@Override
-	public boolean isCancelable() {
-		return false;
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.io.impl.AbstractAlignmentReader#loadAlignment(eu.esdihumboldt.hale.common.core.io.ProgressIndicator,
-	 *      eu.esdihumboldt.hale.common.core.io.report.IOReporter)
-	 */
-	@Override
-	protected MutableAlignment loadAlignment(ProgressIndicator progress, IOReporter reporter)
-			throws IOProviderConfigurationException, IOException {
-
-		progress.begin("Initializing", ProgressIndicator.UNKNOWN);
-
-		final TypeIndex schemaspace = getTargetSchema();
-		if (schemaspace == null) {
-			reporter.error("Load the target schema first!");
-			reporter.setSuccess(false);
-			return null;
-		}
-		if (!(schemaspace instanceof SchemaSpace)) {
-			throw new IllegalArgumentException(
-					"Unknown target schema type: " + schemaspace.getClass());
-		}
-
-		EntityResolver entityResolver = null;
-		if (getServiceProvider() != null) {
-			entityResolver = getServiceProvider().getService(EntityResolver.class);
-		}
-		TypeIndex sourceTypes = getSourceSchema();
-		TypeIndex targetTypes = getTargetSchema();
-
-		final Schema schema = ((SchemaSpace) schemaspace).getSchemas().iterator().next();
-
-		final MutableAlignment alignment;
-
-		try (final InputStream in = getSource().getInput()) {
-
-			progress.setCurrentTask("Loading XtraServer Mapping file");
-
-			final XtraServerMapping xtraServerMapping = XtraServerMappingFile.read().fromStream(in);
-
-			final XtraServerMapping flatXtraServerMapping = XtraServerMappingTransformer
-					.forMapping(xtraServerMapping).applySchemaInfo(schema.getLocation())
-					.flattenInheritance().transform();
-
-			final AlignmentGenerator haleAlignmentGenerator = new AlignmentGenerator(
-					sourceTypes, targetTypes, entityResolver, progress, reporter,
-					flatXtraServerMapping);
-
-			alignment = haleAlignmentGenerator.generate();
-
-		} catch (Exception e) {
-			reporter.error(new IOMessageImpl(e.getMessage(), e));
-			reporter.setSuccess(false);
-			return null;
-		}
-
-		progress.end();
-		reporter.setSuccess(true);
-
-		return alignment;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractPropertyTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractPropertyTransformationHandler.java
deleted file mode 100644
index 2cdb01a154..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractPropertyTransformationHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import javax.xml.namespace.QName;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import eu.esdihumboldt.hale.common.align.model.MutableCell;
-import eu.esdihumboldt.hale.common.align.model.impl.DefaultCell;
-
-/**
- * Abstract Property Transformation Handler
- * 
- * @author zahnen
- */
-abstract class AbstractPropertyTransformationHandler implements PropertyTransformationHandler {
-
-	private final static String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-
-	protected final TransformationContext transformationContext;
-
-	protected AbstractPropertyTransformationHandler(
-			final TransformationContext transformationContext) {
-		this.transformationContext = transformationContext;
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.reader.handler.TransformationHandler#handle(java.lang.Object,
-	 *      java.lang.String)
-	 */
-	@Override
-	public MutableCell handle(final MappingValue mappingValue, final String tableName) {
-		// ignore xsi:nil
-		QName lastPathElement = mappingValue.getQualifiedTargetPath()
-				.get(mappingValue.getQualifiedTargetPath().size() - 1);
-		if (lastPathElement.getNamespaceURI().equals(XSI_NS)
-				&& lastPathElement.getLocalPart().equals("@nil")) {
-			return null;
-		}
-
-		final String transformationIdentifier = doHandle(mappingValue, tableName);
-
-		final MutableCell propertyCell = new DefaultCell();
-
-		propertyCell.setTransformationIdentifier(transformationIdentifier);
-
-		if (transformationContext.hasCurrentSourceProperty()) {
-			propertyCell.setSource(transformationContext.getCurrentSourcePropertyEntities());
-		}
-		propertyCell.setTarget(transformationContext.getCurrentTargetPropertyEntities());
-
-		propertyCell
-				.setTransformationParameters(transformationContext.getCurrentPropertyParameters());
-
-		return propertyCell;
-	}
-
-	protected abstract String doHandle(final MappingValue mappingValue, final String tableName);
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractTypeTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractTypeTransformationHandler.java
deleted file mode 100644
index 24eab8862a..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AbstractTypeTransformationHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import eu.esdihumboldt.hale.common.align.model.MutableCell;
-import eu.esdihumboldt.hale.common.align.model.impl.DefaultCell;
-
-/**
- * Abstract Type Transformation Handler
- * 
- * @author zahnen
- */
-abstract class AbstractTypeTransformationHandler implements TypeTransformationHandler {
-
-	protected final TransformationContext transformationContext;
-
-	protected AbstractTypeTransformationHandler(final TransformationContext transformationContext) {
-		this.transformationContext = transformationContext;
-	}
-
-	@Override
-	public final MutableCell handle(final FeatureTypeMapping featureTypeMapping,
-			final String tableName) {
-
-		transformationContext.nextTypeTransformation(tableName, featureTypeMapping);
-
-		final String transformationIdentifier = doHandle(featureTypeMapping, tableName);
-
-		final MutableCell typeCell = new DefaultCell();
-
-		typeCell.setTransformationIdentifier(transformationIdentifier);
-
-		typeCell.setSource(transformationContext.getCurrentSourceTypeEntities());
-		typeCell.setTarget(transformationContext.getCurrentTargetTypeEntities());
-
-		typeCell.setTransformationParameters(transformationContext.getCurrentTypeParameters());
-
-		return typeCell;
-	}
-
-	public abstract String doHandle(final FeatureTypeMapping featureTypeMapping,
-			final String primaryTableName);
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AlignmentGenerator.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AlignmentGenerator.java
deleted file mode 100644
index db942c16fb..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AlignmentGenerator.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Stream;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.MappingTable;
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.XtraServerMapping;
-import eu.esdihumboldt.hale.common.align.io.EntityResolver;
-import eu.esdihumboldt.hale.common.align.model.MutableAlignment;
-import eu.esdihumboldt.hale.common.align.model.MutableCell;
-import eu.esdihumboldt.hale.common.align.model.impl.DefaultAlignment;
-import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.common.schema.model.TypeIndex;
-
-/**
- * Transforms a {@link XtraServerMapping} to a {@link MutableAlignment}
- * 
- * @author zahnen
- */
-public class AlignmentGenerator {
-
-	private final TransformationContext transformationContext;
-	private final TypeTransformationHandlerFactory typeHandlerFactory;
-	private final PropertyTransformationHandlerFactory propertyHandlerFactory;
-	private final XtraServerMapping xtraServerMapping;
-
-	/**
-	 * @param sourceTypes source types
-	 * @param targetTypes target types
-	 * @param entityResolver entity resolver
-	 * @param progress progress indicator
-	 * @param reporter reporter
-	 * @param xtraServerMapping XtraServer Mapping
-	 * 
-	 */
-	public AlignmentGenerator(final TypeIndex sourceTypes, final TypeIndex targetTypes,
-			final EntityResolver entityResolver, final ProgressIndicator progress,
-			final IOReporter reporter, final XtraServerMapping xtraServerMapping) {
-		this.transformationContext = new TransformationContext(sourceTypes, targetTypes,
-				entityResolver, progress, reporter);
-		this.typeHandlerFactory = TypeTransformationHandler.createFactory(transformationContext);
-		this.propertyHandlerFactory = PropertyTransformationHandler
-				.createFactory(transformationContext);
-		this.xtraServerMapping = xtraServerMapping;
-	}
-
-	/**
-	 * @return the generated alignment
-	 */
-	public MutableAlignment generate() {
-		final MutableAlignment alignment = new DefaultAlignment();
-
-		xtraServerMapping.getFeatureTypeMappings().stream().flatMap(generateFeatureTypeCellStream())
-				.forEach(cell -> alignment.addCell(cell));
-
-		return alignment;
-	}
-
-	private Function<FeatureTypeMapping, Stream<MutableCell>> generateFeatureTypeCellStream() {
-		return featureTypeMapping -> featureTypeMapping.getPrimaryTables().stream()
-				.flatMap(generateTableCellStream(featureTypeMapping, false));
-	}
-
-	private Function<MappingTable, Stream<MutableCell>> generateTableCellStream(
-			final FeatureTypeMapping featureTypeMapping, final boolean isJoined) {
-		return mappingTable -> {
-
-			final Stream<MutableCell> propertyCellStream = mappingTable.getValues().stream()
-					.peek(mappingValue -> System.out.println(mappingValue.getTargetPath()))
-					.map(generatePropertyCell(featureTypeMapping.getName(), mappingTable.getName()))
-					.filter(Optional::isPresent).map(Optional::get);
-
-			// recurse
-			final Stream<MutableCell> joinedPropertyCellStream = mappingTable.getJoiningTables()
-					.stream().flatMap(generateTableCellStream(featureTypeMapping, true));
-
-			final Stream<MutableCell> cellStream = Stream.concat(propertyCellStream,
-					joinedPropertyCellStream);
-
-			if (isJoined) {
-				return cellStream;
-			}
-			else {
-				final Optional<TypeTransformationHandler> typeHandler = typeHandlerFactory
-						.create(featureTypeMapping, mappingTable.getName());
-
-				if (typeHandler.isPresent()) {
-					final MutableCell typeCell = typeHandler.get().handle(featureTypeMapping,
-							mappingTable.getName());
-
-					return Stream.concat(Stream.of(typeCell), cellStream);
-				}
-				else {
-					transformationContext.getReporter().warn(
-							"Mapping for feature type \"{0}\" could not be imported",
-							featureTypeMapping.getName());
-				}
-
-				return Stream.empty();
-			}
-		};
-	}
-
-	private Function<MappingValue, Optional<MutableCell>> generatePropertyCell(
-			final String featureTypeName, final String tableName) {
-		return mappingValue -> {
-			final Optional<PropertyTransformationHandler> propertyHandler = propertyHandlerFactory
-					.create(mappingValue);
-
-			if (propertyHandler.isPresent()) {
-				return Optional.ofNullable(propertyHandler.get().handle(mappingValue, tableName));
-
-			}
-			else {
-				transformationContext.getReporter().warn(
-						"Mapping for property \"{0}\" of feature type \"{1}\" could not be imported",
-						mappingValue.getTargetPath(), featureTypeName);
-			}
-
-			return Optional.empty();
-		};
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AssignHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AssignHandler.java
deleted file mode 100644
index 901a07517a..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/AssignHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.Map;
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.AssignFunction;
-
-/**
- * Transforms a {@link MappingValue} to a {@link AssignFunction}
- * 
- * @author zahnen
- */
-class AssignHandler extends AbstractPropertyTransformationHandler {
-
-	AssignHandler(final TransformationContext transformationContext) {
-		super(transformationContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.reader.handler.AbstractPropertyTransformationHandler#doHandle(de.interactive_instruments.xtraserver.config.api.MappingValue,
-	 *      java.lang.String)
-	 */
-	@Override
-	public String doHandle(final MappingValue mappingValue, final String tableName) {
-
-		Optional<String> bindValue = Optional.<String> empty();
-
-		if (isAttribute(mappingValue.getTargetPath())) {
-			final String parentTarget = mappingValue.getTargetPath().substring(0,
-					mappingValue.getTargetPath().lastIndexOf('/'));
-
-			bindValue = transformationContext.getCurrentFeatureTypeMapping()
-					.getTableValuesForPath(parentTarget).entrySet().stream()
-					.filter(entry -> entry.getKey().getName().equals(tableName))
-					.map(Map.Entry::getValue).filter(value -> !value.getValueColumns().isEmpty())
-					.map(value -> value.getValueColumns().get(0)).findFirst();
-		}
-
-		if (bindValue.isPresent()) {
-			transformationContext.nextPropertyTransformation(mappingValue.getQualifiedTargetPath(),
-					tableName, "anchor", bindValue.get());
-		}
-		else {
-			transformationContext.nextPropertyTransformation(mappingValue.getQualifiedTargetPath());
-		}
-
-		transformationContext.getCurrentPropertyParameters().put("value",
-				new ParameterValue(mappingValue.getValue()));
-
-		return bindValue.isPresent() ? AssignFunction.ID_BOUND : AssignFunction.ID;
-	}
-
-	private boolean isAttribute(String propertyPath) {
-		return propertyPath.contains("/@");
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/FormattedStringHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/FormattedStringHandler.java
deleted file mode 100644
index f34464bbfc..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/FormattedStringHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.FormattedStringFunction;
-
-/**
- * Transforms a {@link MappingValue} to a {@link FormattedStringFunction}
- * 
- * @author zahnen
- */
-class FormattedStringHandler extends AbstractPropertyTransformationHandler {
-
-	private static final Pattern EXPRESSION_PATTERN = Pattern.compile(
-			"(?:(?:'(?<text>[^']*?)')|(?:(?:\\$T\\$\\.)(?<column>[\\S]+)))(?:\\s*\\|\\|\\s*)?");
-
-	FormattedStringHandler(final TransformationContext transformationContext) {
-		super(transformationContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.reader.handler.AbstractPropertyTransformationHandler#doHandle(de.interactive_instruments.xtraserver.config.api.MappingValue,
-	 *      java.lang.String)
-	 */
-	@Override
-	public String doHandle(final MappingValue mappingValue, final String tableName) {
-
-		final Matcher matcher = EXPRESSION_PATTERN.matcher(mappingValue.getValue());
-		final StringBuilder pattern = new StringBuilder();
-		final List<String> columns = new ArrayList<>();
-
-		while (matcher.find()) {
-			String text = matcher.group("text");
-			String column = matcher.group("column");
-
-			if (text != null) {
-				pattern.append(text);
-			}
-			else if (column != null) {
-				pattern.append('{').append(column).append('}');
-				columns.add(column);
-			}
-		}
-
-		if (columns.isEmpty()) {
-			throw new IllegalArgumentException(
-					"Expression could not be parsed: " + mappingValue.getValue());
-		}
-
-		transformationContext.nextPropertyTransformation(mappingValue.getQualifiedTargetPath(),
-				tableName, "var", columns.toArray(new String[0]));
-
-		transformationContext.getCurrentPropertyParameters().put("pattern",
-				new ParameterValue(pattern.toString()));
-
-		return FormattedStringFunction.ID;
-	}
-
-	static boolean isFormattedStringExpression(String expression) {
-		Matcher matcher = EXPRESSION_PATTERN.matcher(expression);
-		boolean matches = false;
-
-		do {
-			matches = matcher.find();
-		} while (matches && !matcher.hitEnd());
-
-		return matches;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/JoinHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/JoinHandler.java
deleted file mode 100644
index a238bb045b..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/JoinHandler.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-import javax.xml.namespace.QName;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.MappingJoin;
-import de.interactive_instruments.xtraserver.config.api.MappingTable;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.JoinFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.join.JoinParameter;
-import eu.esdihumboldt.hale.common.align.model.functions.join.JoinParameter.JoinCondition;
-import eu.esdihumboldt.hale.common.align.model.impl.PropertyEntityDefinition;
-import eu.esdihumboldt.hale.common.core.io.Value;
-
-/**
- * Transforms a {@link FeatureTypeMapping} to a {@link JoinFunction}
- * 
- * @author zahnen
- */
-class JoinHandler extends AbstractTypeTransformationHandler {
-
-	private final Set<String> seenTables;
-
-	JoinHandler(final TransformationContext mappingContext) {
-		super(mappingContext);
-		this.seenTables = new HashSet<>();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public String doHandle(final FeatureTypeMapping featureTypeMapping,
-			final String primaryTableName) {
-
-		final Optional<MappingTable> primaryTable = featureTypeMapping.getTable(primaryTableName);
-
-		if (!primaryTable.isPresent()) {
-			throw new IllegalArgumentException("Primary table not found: " + primaryTableName);
-		}
-
-		seenTables.add(primaryTableName);
-
-		final Set<JoinCondition> joinConditions = primaryTable.get().getAllJoiningTablesStream()
-				.filter(isNotJoinedYet()).filter(hasValues())
-				.flatMap(joinedTable -> joinedTable.getJoinPaths().stream())
-				.flatMap(joinPath -> joinPath.getJoinConditions().stream())
-				.map(toHaleJoinCondition()).collect(Collectors.toSet());
-
-		final JoinParameter joinParameter = new JoinParameter(
-				transformationContext.getCurrentSourceTypeEntityDefinitions(), joinConditions);
-
-		final String validation = joinParameter.validate();
-		if (validation != null) {
-			throw new IllegalArgumentException("Join parameter invalid: " + validation);
-		}
-
-		transformationContext.getCurrentTypeParameters().put("join",
-				new ParameterValue(Value.complex(joinParameter)));
-
-		return JoinFunction.ID;
-	}
-
-	private Function<MappingJoin.Condition, JoinCondition> toHaleJoinCondition() {
-		return condition -> {
-
-			final QName baseTableName = transformationContext.addTable(condition.getSourceTable());
-			final QName joinedTableName = transformationContext
-					.addTable(condition.getTargetTable());
-
-			final PropertyEntityDefinition baseProperty = transformationContext
-					.getEntityDefinition(baseTableName, new QName(condition.getSourceField()));
-			final PropertyEntityDefinition joinedProperty = transformationContext
-					.getEntityDefinition(joinedTableName, new QName(condition.getTargetField()));
-
-			return new JoinCondition(baseProperty, joinedProperty);
-		};
-	}
-
-	private Predicate<MappingTable> isNotJoinedYet() {
-		return joinedTable -> {
-			if (seenTables.contains(joinedTable.getName())) {
-				transformationContext.getReporter()
-						.warn("Table is already joined for this feature type, skipping: "
-								+ joinedTable.getName() + " ["
-								+ joinedTable.getJoinPaths().toString() + "]");
-
-				return false;
-			}
-
-			seenTables.add(joinedTable.getName());
-			return true;
-		};
-	}
-
-	private Predicate<MappingTable> hasValues() {
-		return joinedTable -> !joinedTable.getValues().isEmpty();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandler.java
deleted file mode 100644
index 28f5086061..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-
-/**
- * Handler for Property transformations
- * 
- * @author zahnen
- */
-@FunctionalInterface
-public interface PropertyTransformationHandler extends TransformationHandler<MappingValue> {
-
-	/**
-	 * Create a new {@link PropertyTransformationHandlerFactory} object
-	 * 
-	 * @param transformationContext Transformation Context
-	 * @return new Property Transformation Handler Factory object
-	 */
-	public static PropertyTransformationHandlerFactory createFactory(
-			final TransformationContext transformationContext) {
-		return new PropertyTransformationHandlerFactory(transformationContext);
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandlerFactory.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandlerFactory.java
deleted file mode 100644
index c928641b2e..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/PropertyTransformationHandlerFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-
-/**
- * Factory for creating Property Transformation Handlers
- * 
- * @author zahnen
- */
-public class PropertyTransformationHandlerFactory {
-
-	private final TransformationContext transformationContext;
-
-	/**
-	 * @param transformationContext the transformation context
-	 */
-	public PropertyTransformationHandlerFactory(TransformationContext transformationContext) {
-		this.transformationContext = transformationContext;
-	}
-
-	/**
-	 * Create a new Property Transformation Handler
-	 * 
-	 * @param mappingValue the mapping that should be transformed
-	 * 
-	 * @return new TypeHandler
-	 */
-	public Optional<PropertyTransformationHandler> create(final MappingValue mappingValue) {
-		if (mappingValue.isExpression()
-				&& FormattedStringHandler.isFormattedStringExpression(mappingValue.getValue())) {
-			return Optional.of(new FormattedStringHandler(transformationContext));
-		}
-		else if (mappingValue.isConstant()) {
-			return Optional.of(new AssignHandler(transformationContext));
-		}
-		else if (mappingValue.isColumn()) {
-			return Optional.of(new RenameHandler(transformationContext));
-		}
-
-		return Optional.empty();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RenameHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RenameHandler.java
deleted file mode 100644
index 8b6d23d101..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RenameHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.RenameFunction;
-
-/**
- * Transforms a {@link MappingValue} to a {@link RenameFunction}
- * 
- * @author zahnen
- */
-class RenameHandler extends AbstractPropertyTransformationHandler {
-
-	RenameHandler(final TransformationContext transformationContext) {
-		super(transformationContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.reader.handler.AbstractPropertyTransformationHandler#doHandle(de.interactive_instruments.xtraserver.config.api.MappingValue,
-	 *      java.lang.String)
-	 */
-	@Override
-	public String doHandle(final MappingValue mappingValue, final String tableName) {
-
-		transformationContext.nextPropertyTransformation(tableName, mappingValue.getValue(),
-				mappingValue.getQualifiedTargetPath());
-
-		final ListMultimap<String, ParameterValue> parameters = transformationContext
-				.getCurrentPropertyParameters();
-
-		parameters.put("ignoreNamespaces", new ParameterValue("false"));
-		parameters.put("structuralRename", new ParameterValue("false"));
-
-		return RenameFunction.ID;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RetypeHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RetypeHandler.java
deleted file mode 100644
index 605e450c18..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/RetypeHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.RetypeFunction;
-
-/**
- * Transforms a {@link FeatureTypeMapping} to a {@link RetypeFunction}
- * 
- * @author zahnen
- */
-class RetypeHandler extends AbstractTypeTransformationHandler {
-
-	RetypeHandler(final TransformationContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.reader.handler.AbstractTypeTransformationHandler#doHandle(de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping,
-	 *      java.lang.String)
-	 */
-	@Override
-	public String doHandle(final FeatureTypeMapping featureTypeMapping,
-			final String primaryTableName) {
-
-		final ListMultimap<String, ParameterValue> parameters = transformationContext
-				.getCurrentTypeParameters();
-
-		parameters.put("ignoreNamespaces", new ParameterValue("false"));
-		parameters.put("structuralRename", new ParameterValue("false"));
-
-		return RetypeFunction.ID;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationContext.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationContext.java
deleted file mode 100644
index eb0c616af8..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationContext.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import eu.esdihumboldt.hale.common.align.io.EntityResolver;
-import eu.esdihumboldt.hale.common.align.io.impl.internal.generated.ChildContextType;
-import eu.esdihumboldt.hale.common.align.io.impl.internal.generated.ClassType;
-import eu.esdihumboldt.hale.common.align.io.impl.internal.generated.NamedEntityType;
-import eu.esdihumboldt.hale.common.align.io.impl.internal.generated.PropertyType;
-import eu.esdihumboldt.hale.common.align.model.ChildContext;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.impl.PropertyEntityDefinition;
-import eu.esdihumboldt.hale.common.align.model.impl.TypeEntityDefinition;
-import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
-import eu.esdihumboldt.hale.common.schema.model.ChildDefinition;
-import eu.esdihumboldt.hale.common.schema.model.PropertyConstraint;
-import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
-import eu.esdihumboldt.hale.common.schema.model.TypeIndex;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultPropertyDefinition;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultTypeDefinition;
-import eu.esdihumboldt.hale.io.xsd.constraint.XmlElements;
-
-/**
- * 
- * 
- * @author zahnen
- */
-public final class TransformationContext {
-
-	private final TypeIndex sourceTypes;
-	private final TypeIndex targetTypes;
-	private final EntityResolver entityResolver;
-	private final IOReporter reporter;
-	private Set<QName> currentSourceTableNames;
-	private QName currentTargetTypeName;
-	private FeatureTypeMapping currentFeatureTypeMapping;
-	private ListMultimap<String, ParameterValue> currenTypeParameters;
-	private ListMultimap<String, ParameterValue> currentPropertyParameters;
-	private Set<NamedEntityType> currentSourcePropertyNames;
-	private NamedEntityType currentTargetPropertyName;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param sourceTypes source types
-	 * @param targetTypes target types
-	 * @param entityResolver entity resolver
-	 * @param progress progress indicator
-	 * @param reporter reporter
-	 */
-	public TransformationContext(final TypeIndex sourceTypes, final TypeIndex targetTypes,
-			final EntityResolver entityResolver, final ProgressIndicator progress,
-			final IOReporter reporter) {
-		this.sourceTypes = sourceTypes;
-		this.targetTypes = targetTypes;
-		this.entityResolver = entityResolver;
-		this.reporter = reporter;
-	}
-
-	void nextTypeTransformation(String sourceType, FeatureTypeMapping featureTypeMapping) {
-		this.currentSourceTableNames = new LinkedHashSet<>();
-		addTable(sourceType);
-		this.currentTargetTypeName = findTargetType(featureTypeMapping.getQualifiedName());
-		this.currentFeatureTypeMapping = featureTypeMapping;
-		this.currenTypeParameters = ArrayListMultimap.create();
-	}
-
-	void nextPropertyTransformation(List<QName> targetProperty) {
-
-		nextPropertyTransformation(targetProperty, null, "");
-
-	}
-
-	void nextPropertyTransformation(String sourceType, String sourceProperty,
-			List<QName> targetProperty) {
-
-		nextPropertyTransformation(targetProperty, sourceType, "", sourceProperty);
-
-	}
-
-	void nextPropertyTransformation(List<QName> targetProperty, String sourceType,
-			String sourceVarName, String... sourceProperties) {
-
-		if (sourceType != null && sourceProperties != null && sourceProperties.length > 0) {
-			final QName sourceTableName = findCurrentSourceType(sourceType);
-
-			this.currentSourcePropertyNames = Arrays.stream(sourceProperties)
-					.map(sourceProperty -> getNamedEntity(sourceTableName,
-							new QName(sourceProperty), sourceVarName))
-					.collect(Collectors.toSet());
-		}
-		else {
-			this.currentSourcePropertyNames = new LinkedHashSet<>();
-		}
-
-		this.currentTargetPropertyName = getNamedEntity(currentTargetTypeName, targetProperty, "");
-
-		this.currentPropertyParameters = ArrayListMultimap.create();
-	}
-
-	boolean hasCurrentSourceProperty() {
-		return !this.currentSourcePropertyNames.isEmpty();
-	}
-
-	QName addTable(String name) {
-		final QName qualifiedName = findSourceType(name);
-
-		currentSourceTableNames.add(qualifiedName);
-
-		return qualifiedName;
-	}
-
-	Set<QName> getCurrentSourceTableNames() {
-		return this.currentSourceTableNames;
-	}
-
-	QName getCurrentTargetTypeName() {
-		return this.currentTargetTypeName;
-	}
-
-	ListMultimap<String, ParameterValue> getCurrentTypeParameters() {
-		return this.currenTypeParameters;
-	}
-
-	ListMultimap<String, ParameterValue> getCurrentPropertyParameters() {
-		return this.currentPropertyParameters;
-	}
-
-	/**
-	 * @return the currentFeatureTypeMapping
-	 */
-	FeatureTypeMapping getCurrentFeatureTypeMapping() {
-		return currentFeatureTypeMapping;
-	}
-
-	IOReporter getReporter() {
-		return reporter;
-	}
-
-	List<NamedEntityType> getCurrentSourceTableNamedEntities() {
-
-		return currentSourceTableNames.stream().map(this::getNamedEntityType)
-				.collect(Collectors.toList());
-	}
-
-	List<TypeEntityDefinition> getCurrentSourceTypeEntityDefinitions() {
-		return currentSourceTableNames.stream()
-				.map(sourceTableName -> new TypeEntityDefinition(
-						new DefaultTypeDefinition(sourceTableName), SchemaSpaceID.SOURCE, null))
-				.collect(Collectors.toList());
-	}
-
-	ListMultimap<String, Entity> getCurrentSourceTypeEntities() {
-
-		return convertEntities(getCurrentSourceTableNamedEntities(), sourceTypes,
-				SchemaSpaceID.SOURCE);
-	}
-
-	ListMultimap<String, Entity> getCurrentTargetTypeEntities() {
-
-		return convertEntities(ImmutableList.of(getNamedEntity(currentTargetTypeName)), targetTypes,
-				SchemaSpaceID.TARGET);
-	}
-
-	ListMultimap<String, Entity> getCurrentSourcePropertyEntities() {
-
-		return convertEntities(ImmutableList.copyOf(currentSourcePropertyNames), sourceTypes,
-				SchemaSpaceID.SOURCE);
-	}
-
-	ListMultimap<String, Entity> getCurrentTargetPropertyEntities() {
-
-		return convertEntities(ImmutableList.of(currentTargetPropertyName), targetTypes,
-				SchemaSpaceID.TARGET);
-	}
-
-	private ListMultimap<String, Entity> convertEntities(List<NamedEntityType> namedEntities,
-			TypeIndex types, SchemaSpaceID schemaSpace) {
-		if (namedEntities == null || namedEntities.isEmpty()) {
-			return null;
-		}
-
-		ListMultimap<String, Entity> result = ArrayListMultimap.create();
-
-		for (NamedEntityType namedEntity : namedEntities) {
-			/**
-			 * Resolve entity.
-			 * 
-			 * Possible results:
-			 * <ul>
-			 * <li>non-null entity - entity could be resolved</li>
-			 * <li>null entity - entity could not be resolved, continue</li>
-			 * <li>IllegalStateException - entity could not be resolved, reject cell</li>
-			 * </ul>
-			 */
-			Entity entity = entityResolver.resolve(namedEntity.getAbstractEntity().getValue(),
-					types, schemaSpace);
-
-			if (entity != null) {
-				result.put(namedEntity.getName(), entity);
-			}
-		}
-
-		return result;
-	}
-
-	QName findSourceType(String name) {
-		return sourceTypes.getTypes().stream().map(TypeDefinition::getName)
-				.filter(type -> type.getLocalPart().equals(name)).findFirst().orElseThrow(
-						() -> new IllegalArgumentException("Source type '" + name + "' not found"));
-	}
-
-	QName findTargetType(QName name) {
-		return targetTypes.getTypes().stream()
-				.filter(typeDefinition -> name.equals(getElementNameForType(typeDefinition)))
-				.map(TypeDefinition::getName).findFirst().orElseThrow(
-						() -> new IllegalArgumentException("Target type '" + name + "' not found"));
-	}
-
-	QName findCurrentSourceType(String name) {
-		return currentSourceTableNames.stream()
-				.filter(tableName -> name.equals(tableName.getLocalPart())).findFirst().orElseThrow(
-						() -> new IllegalArgumentException("Source type '" + name + "' not found"));
-	}
-
-	QName getElementNameForType(TypeDefinition typeDefinition) {
-		final XmlElements constraints = typeDefinition.getConstraint(XmlElements.class);
-		if (constraints == null || constraints.getElements().size() == 0) {
-			// throw new IllegalStateException("No constraint has been specified.");
-			return null;
-		}
-		else if (constraints.getElements().size() > 1) {
-			// throw new IllegalStateException("More than one constraint has been
-			// specified.");
-			return null;
-		}
-
-		return constraints.getElements().iterator().next().getName();
-	}
-
-	NamedEntityType getNamedEntity(QName qname) {
-		return getNamedEntity(qname, "");
-	}
-
-	NamedEntityType getNamedEntityType(QName qname) {
-		return getNamedEntity(qname, "types");
-	}
-
-	NamedEntityType getNamedEntity(QName qname, String name) {
-		ClassType.Type sourceQNT = new ClassType.Type();
-		sourceQNT.setName(qname.getLocalPart());
-		sourceQNT.setNs(qname.getNamespaceURI());
-		ClassType sourceQN = new ClassType();
-		sourceQN.setType(sourceQNT);
-		NamedEntityType sourceType = new NamedEntityType();
-		if (!name.isEmpty())
-			sourceType.setName(name);
-		sourceType.setAbstractEntity(
-				new JAXBElement<ClassType>(new QName("type"), ClassType.class, sourceQN));
-
-		return sourceType;
-	}
-
-	NamedEntityType getNamedEntity(QName qname, QName property) {
-		return getNamedEntity(qname, property, "");
-	}
-
-	NamedEntityType getNamedEntity(QName qname, List<QName> properties) {
-		return getNamedEntity(qname, properties, "");
-	}
-
-	private NamedEntityType getNamedEntity(QName qname, QName property, String name) {
-		return getNamedEntity(qname, Lists.newArrayList(property), name);
-	}
-
-	private NamedEntityType getNamedEntity(QName qname, List<QName> properties, String name) {
-		PropertyType.Type sourceQNT = new PropertyType.Type();
-		sourceQNT.setName(qname.getLocalPart());
-		sourceQNT.setNs(qname.getNamespaceURI());
-
-		PropertyType sourceQN = new PropertyType();
-		sourceQN.setType(sourceQNT);
-
-		for (QName p : properties) {
-			String localName = p.getLocalPart().startsWith("@") ? p.getLocalPart().substring(1)
-					: p.getLocalPart();
-			ChildContextType sourceP = new ChildContextType();
-			sourceP.setName(localName);
-			sourceP.setNs(p.getNamespaceURI());
-			sourceQN.getChild().add(sourceP);
-		}
-
-		NamedEntityType sourceType = new NamedEntityType();
-		if (!name.isEmpty())
-			sourceType.setName(name);
-		sourceType.setAbstractEntity(
-				new JAXBElement<PropertyType>(new QName("type"), PropertyType.class, sourceQN));
-
-		return sourceType;
-	}
-
-	PropertyEntityDefinition getEntityDefinition(QName qname, QName property) {
-		TypeDefinition typeDefinition = new DefaultTypeDefinition(qname);
-
-		ChildDefinition<PropertyConstraint> child = new DefaultPropertyDefinition(property,
-				typeDefinition, typeDefinition);
-
-		typeDefinition.addChild(child);
-
-		List<ChildContext> path = new ArrayList<>();
-		path.add(new ChildContext(child));
-
-		return new PropertyEntityDefinition(typeDefinition, path, SchemaSpaceID.SOURCE, null);
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationHandler.java
deleted file mode 100644
index f629072659..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TransformationHandler.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import eu.esdihumboldt.hale.common.align.model.MutableCell;
-
-/**
- * Transformation Handler
- * 
- * @param <T> output type to transform to
- * 
- * @author zahnen
- */
-@FunctionalInterface
-public interface TransformationHandler<T> {
-
-	/**
-	 * Transforms a {@link FeatureTypeMapping} or a {@link MappingValue} to an
-	 * alignment cell
-	 * 
-	 * @param typeOrProperty the mapping
-	 * @param tableName the primary table name
-	 * 
-	 * @return alignment cell
-	 */
-	MutableCell handle(final T typeOrProperty, final String tableName);
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandler.java
deleted file mode 100644
index 0f5af0330a..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandler.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-
-/**
- * Handler for Type transformations
- * 
- * @author zahnen
- */
-@FunctionalInterface
-public interface TypeTransformationHandler extends TransformationHandler<FeatureTypeMapping> {
-
-	/**
-	 * Create a new {@link TypeTransformationHandlerFactory} object
-	 * 
-	 * @param transformationContext Transformation Context
-	 * @return new Type Transformation Handler Factory object
-	 */
-	public static TypeTransformationHandlerFactory createFactory(
-			final TransformationContext transformationContext) {
-		return new TypeTransformationHandlerFactory(transformationContext);
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandlerFactory.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandlerFactory.java
deleted file mode 100644
index bab796c79f..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/reader/handler/TypeTransformationHandlerFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.reader.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-
-/**
- * Factory for creating Type Transformation Handlers
- * 
- * @author zahnen
- */
-public class TypeTransformationHandlerFactory {
-
-	private final TransformationContext transformationContext;
-
-	/**
-	 * @param transformationContext the transformation context
-	 */
-	public TypeTransformationHandlerFactory(TransformationContext transformationContext) {
-		this.transformationContext = transformationContext;
-	}
-
-	/**
-	 * Create a new Transformation Type Handler
-	 * 
-	 * @param featureTypeMapping the mapping that should be transformed
-	 * @param primaryTableName primary table name
-	 * 
-	 * @return new TypeHandler
-	 */
-	public Optional<TypeTransformationHandler> create(final FeatureTypeMapping featureTypeMapping,
-			final String primaryTableName) {
-		if (featureTypeMapping.getTable(primaryTableName).isPresent()) {
-			if (featureTypeMapping.getTable(primaryTableName).get().getJoiningTables().isEmpty()) {
-				return Optional.of(new RetypeHandler(transformationContext));
-			}
-			else {
-				return Optional.of(new JoinHandler(transformationContext));
-			}
-		}
-
-		return Optional.empty();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriter.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriter.java
deleted file mode 100644
index d18a4e6d41..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingFileWriter.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.JAXBException;
-import javax.xml.stream.XMLStreamException;
-
-import org.xml.sax.SAXException;
-
-import de.interactive_instruments.xtraserver.config.api.XtraServerMapping;
-import de.interactive_instruments.xtraserver.config.io.XtraServerMappingFile;
-import eu.esdihumboldt.hale.common.align.io.impl.AbstractAlignmentWriter;
-import eu.esdihumboldt.hale.common.core.io.IOProviderConfigurationException;
-import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.ValueProperties;
-import eu.esdihumboldt.hale.common.core.io.project.ComplexConfigurationService;
-import eu.esdihumboldt.hale.common.core.io.project.ProjectIO;
-import eu.esdihumboldt.hale.common.core.io.project.model.Project;
-import eu.esdihumboldt.hale.common.core.io.report.IOReport;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.UnsupportedTransformationException;
-
-/**
- * Writes an Alignment to a XtraServer Mapping file.
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class XtraServerMappingFileWriter extends AbstractAlignmentWriter {
-
-	private final static String WRITER_TYPE_NAME = "XtraServer Mapping Exporter";
-
-	static final String CONTENT_TYPE_MAPPING = "eu.esdihumboldt.hale.io.xtraserver.mapping.xml";
-
-	static final String CONTENT_TYPE_ARCHIVE = "eu.esdihumboldt.hale.io.xtraserver.mapping.archive";
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.core.io.IOProvider#isCancelable()
-	 */
-	@Override
-	public boolean isCancelable() {
-		return false;
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.core.io.impl.AbstractIOProvider#getDefaultTypeName()
-	 */
-	@Override
-	protected String getDefaultTypeName() {
-		return WRITER_TYPE_NAME;
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.core.io.impl.AbstractIOProvider#execute(eu.esdihumboldt.hale.common.core.io.ProgressIndicator,
-	 *      eu.esdihumboldt.hale.common.core.io.report.IOReporter)
-	 */
-	@Override
-	protected IOReport execute(final ProgressIndicator progress, final IOReporter reporter)
-			throws IOProviderConfigurationException, IOException {
-
-		ValueProperties projectProperties = null;
-		if (getProjectInfo() instanceof Project) {
-			final ComplexConfigurationService service = ProjectIO
-					.createProjectConfigService((Project) getProjectInfo());
-			projectProperties = service.getProperty("variables").as(ValueProperties.class);
-		}
-		if (projectProperties == null) {
-			projectProperties = new ValueProperties();
-		}
-
-		progress.begin("Initialising", ProgressIndicator.UNKNOWN);
-		if (getAlignment() == null) {
-			throw new IOProviderConfigurationException("No alignment was provided.");
-		}
-		if (getTargetSchema() == null) {
-			throw new IOProviderConfigurationException("No target schema was provided.");
-		}
-		if (getTarget() == null) {
-			throw new IOProviderConfigurationException("No target was provided.");
-		}
-		try (final OutputStream out = getTarget().getOutput()) {
-			final XtraServerMappingGenerator generator = new XtraServerMappingGenerator(
-					getAlignment(), getTargetSchema(), progress,
-					Collections.unmodifiableMap(projectProperties), getProjectInfo(),
-					getProjectLocation(), reporter);
-			final XtraServerMapping mapping = generator.generate(reporter);
-			XtraServerMappingFile.Writer writer = XtraServerMappingFile.write().mapping(mapping);
-
-			if (getContentType().getId().equals(CONTENT_TYPE_MAPPING)) {
-				progress.setCurrentTask("Writing XtraServer Mapping file");
-			}
-			else if (getContentType().getId().equals(CONTENT_TYPE_ARCHIVE)) {
-				progress.setCurrentTask("Writing XtraServer Mapping Archive");
-				writer.createArchiveWithAdditionalFiles();
-			}
-			else {
-				throw new IOProviderConfigurationException(
-						"Content type not supported: " + getContentType().getName());
-			}
-			writer.toStream(out);
-			progress.advance(1);
-
-			final Set<String> missingAssociationTargets = generator.getMissingAssociationTargets();
-			if (!missingAssociationTargets.isEmpty()) {
-				StringBuilder builder = new StringBuilder();
-				int warningCount = 0;
-				for (String s : missingAssociationTargets) {
-					builder.append(System.getProperty("line.separator"));
-					builder.append(s);
-					warningCount++;
-				}
-				reporter.countWarning(warningCount);
-
-				reporter.warn(
-						"To determine the mapping association targets, this plugin relies on annotations "
-								+ "that are described in 'ISO 19109 - Rules for application schema'. "
-								+ "This requires that references possess a GML 'targetElement' elment inside an 'appInfo' "
-								+ "schema annotation. Please note that the following list of properties are not mapped with "
-								+ "association targets due to missing annotations: {0} ",
-						builder.toString());
-			}
-		} catch (final UnsupportedTransformationException e) {
-			reporter.error("The transformation of the type '" + e.getTransformationIdentifier()
-					+ "'  is not supported. Make sure that the XtraServer compatibility mode is enabled.");
-			reporter.setSuccess(false);
-			return reporter;
-		} catch (final JAXBException | SAXException | XMLStreamException e) {
-			reporter.error("An internal error occurred", e);
-			reporter.setSuccess(false);
-			return reporter;
-		}
-		progress.end();
-		reporter.setSuccess(true);
-		return reporter;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingGenerator.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingGenerator.java
deleted file mode 100644
index 59a8d23b55..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingGenerator.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer;
-
-import java.net.URI;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import de.interactive_instruments.xtraserver.config.api.XtraServerMapping;
-import eu.esdihumboldt.hale.common.align.model.Alignment;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.core.io.ProgressIndicator;
-import eu.esdihumboldt.hale.common.core.io.Value;
-import eu.esdihumboldt.hale.common.core.io.project.ProjectInfo;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.CellParentWrapper;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.MappingContext;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.PropertyTransformationHandler;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.PropertyTransformationHandlerFactory;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandlerFactory;
-import eu.esdihumboldt.hale.io.xtraserver.writer.handler.UnsupportedTransformationException;
-
-/**
- * Translates an Alignment to a XtraServer Mapping.
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class XtraServerMappingGenerator {
-
-	private final Alignment alignment;
-	private final TypeTransformationHandlerFactory typeHandlerFactory;
-	private final PropertyTransformationHandlerFactory propertyHandlerFactory;
-	private final ProgressIndicator progress;
-	private final MappingContext mappingContext;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param alignment the Alignment with all cells
-	 * @param targetSchemaSpace the target schema
-	 * @param progress Progress indicator
-	 * @param projectProperties project transformation properties
-	 * @param projectInfo project info
-	 * @param projectLocation project file
-	 * @param reporter reporter
-	 */
-	public XtraServerMappingGenerator(final Alignment alignment,
-			final SchemaSpace targetSchemaSpace, final ProgressIndicator progress,
-			final Map<String, Value> projectProperties, final ProjectInfo projectInfo,
-			final URI projectLocation, final IOReporter reporter) {
-		this.alignment = alignment;
-		mappingContext = new MappingContext(alignment, targetSchemaSpace, projectProperties,
-				projectInfo, projectLocation, reporter);
-		this.typeHandlerFactory = TypeTransformationHandler.createFactory(mappingContext);
-		this.propertyHandlerFactory = PropertyTransformationHandler.createFactory(mappingContext);
-		// Calculate the total work units for the progress indicator (+1 for
-		// writing the
-		// file)
-		int c = 1;
-		for (final Cell typeCell : this.alignment.getActiveTypeCells()) {
-			c += this.alignment.getPropertyCells(typeCell).size() + 1;
-		}
-		progress.begin("Translating hale alignment to XtraServer Mapping file", c);
-		this.progress = progress;
-	}
-
-	/**
-	 * Generates the Mapping object
-	 * 
-	 * @param reporter status reporter
-	 * @return the generated XtraServer Mapping
-	 * 
-	 * @throws UnsupportedTransformationException if the transformation of types
-	 *             or properties is not supported
-	 */
-	public XtraServerMapping generate(final IOReporter reporter)
-			throws UnsupportedTransformationException {
-
-		for (final Cell typeCell : this.alignment.getActiveTypeCells()) {
-			final String typeTransformationIdentifier = typeCell.getTransformationIdentifier();
-			// Create FeatureTypeMapping from the type cells. The Mapping tables
-			// are created
-			// and added by the Type Handlers
-			this.progress.setCurrentTask("Transforming type");
-			final TypeTransformationHandler typeHandler = typeHandlerFactory
-					.create(typeTransformationIdentifier);
-			if (typeHandler != null) {
-				typeHandler.handle(typeCell);
-				this.progress.setCurrentTask(
-						"Mapping values for Feature Type " + mappingContext.getFeatureTypeName());
-				// Add MappingValues from the type cell's property cells
-				for (final Cell propertyCell : this.alignment.getPropertyCells(typeCell).stream()
-						.sorted(new Comparator<Cell>() {
-
-							@Override
-							public int compare(Cell c1, Cell c2) {
-								return c1.getPriority().compareTo(c2.getPriority());
-							}
-						}).collect(Collectors.toList())) {
-					final String propertyTransformationIdentifier = propertyCell
-							.getTransformationIdentifier();
-					final PropertyTransformationHandler propertyHandler = propertyHandlerFactory
-							.create(propertyTransformationIdentifier);
-					if (propertyHandler != null) {
-						propertyHandler.handle(new CellParentWrapper(typeCell, propertyCell));
-					}
-					this.progress.advance(1);
-				}
-			}
-			else {
-				this.progress.advance(this.alignment.getPropertyCells(typeCell).size());
-			}
-		}
-		return mappingContext.getMapping();
-	}
-
-	/**
-	 * Return all property paths for which no association target could be found
-	 * in the schema.
-	 * 
-	 * @return list of properties with missing association targets
-	 */
-	public Set<String> getMissingAssociationTargets() {
-		return this.mappingContext.getMissingAssociationTargets();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingUtils.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingUtils.java
deleted file mode 100644
index 513f2cdac1..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/XtraServerMappingUtils.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2018 wetransform GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     wetransform GmbH <http://www.wetransform.to>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer;
-
-import com.google.common.collect.ListMultimap;
-
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.Property;
-
-/**
- * Utility methods for mapping generation.
- * 
- * @author Stefano Costa, GeoSolutions
- */
-public class XtraServerMappingUtils {
-
-	/**
-	 * Return the first source {@link Entity}, which is assumed to be a
-	 * {@link Property}.
-	 * 
-	 * @param propertyCell the property cell
-	 * @return the target {@link Property}
-	 */
-	public static Property getSourceProperty(Cell propertyCell) {
-		ListMultimap<String, ? extends Entity> sourceEntities = propertyCell.getSource();
-		if (sourceEntities != null && !sourceEntities.isEmpty()) {
-			return (Property) sourceEntities.values().iterator().next();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Return the first target {@link Entity}, which is assumed to be a
-	 * {@link Property}.
-	 * 
-	 * @param propertyCell the property cell
-	 * @return the target {@link Property}
-	 */
-	public static Property getTargetProperty(Cell propertyCell) {
-		ListMultimap<String, ? extends Entity> targetEntities = propertyCell.getTarget();
-		if (targetEntities != null && !targetEntities.isEmpty()) {
-			return (Property) targetEntities.values().iterator().next();
-		}
-
-		return null;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractPropertyTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractPropertyTransformationHandler.java
deleted file mode 100644
index 07f0241930..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractPropertyTransformationHandler.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.xml.namespace.QName;
-
-import org.apache.ws.commons.schema.XmlSchemaAppInfo;
-import org.w3c.dom.Node;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ChildContext;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.schema.model.ChildDefinition;
-import eu.esdihumboldt.hale.common.schema.model.PropertyDefinition;
-import eu.esdihumboldt.hale.common.schema.model.constraint.property.Reference;
-import eu.esdihumboldt.hale.io.xsd.constraint.XmlAppInfo;
-import eu.esdihumboldt.hale.io.xsd.constraint.XmlAttributeFlag;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Abstract Property Transformation Handler
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-abstract class AbstractPropertyTransformationHandler implements PropertyTransformationHandler {
-
-	protected final MappingContext mappingContext;
-
-	protected AbstractPropertyTransformationHandler(final MappingContext mappingContext) {
-		this.mappingContext = mappingContext;
-	}
-
-	protected List<QName> buildPath(final List<ChildContext> path) {
-		return buildPath(path, false);
-	}
-
-	protected List<QName> buildPathWithoutLast(final List<ChildContext> path) {
-		return buildPath(path, true);
-	}
-
-	protected List<QName> buildPath(final List<ChildContext> path, final boolean withoutLast) {
-		return path.stream().map(segment -> segment.getChild().asProperty())
-				.filter(Objects::nonNull).map(toPropertyNameWithAttributePrefix())
-				.limit(withoutLast ? path.size() - 1 : path.size()).collect(Collectors.toList());
-	}
-
-	private Function<PropertyDefinition, QName> toPropertyNameWithAttributePrefix() {
-		return property -> property.getConstraint(XmlAttributeFlag.class).isEnabled() ? new QName(
-				property.getName().getNamespaceURI(), "@" + property.getName().getLocalPart())
-				: property.getName();
-	}
-
-	protected static String propertyName(final List<ChildContext> path) {
-		if (path == null || path.isEmpty()) {
-			return "";
-		}
-		return path.get(path.size() - 1).getChild().getName().getLocalPart();
-	}
-
-	protected static String getSingleProperty(
-			final ListMultimap<String, ParameterValue> parameters, final String name) {
-		if (parameters != null) {
-			final List<ParameterValue> parameterValues = parameters.get(name);
-			if (parameterValues != null && !parameterValues.isEmpty()) {
-				return parameterValues.get(0).as(String.class);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Check if the property cell is a reference and if yes add the association
-	 * target that is found in the schema.
-	 * 
-	 * @param propertyCell Property cell
-	 * @param lastValue associated value mapping for the property
-	 * @return possibly changed value mapping
-	 */
-	private MappingValue ensureAssociationTarget(final Cell propertyCell,
-			final MappingValue lastValue) {
-		final Property targetProperty = XtraServerMappingUtils.getTargetProperty(propertyCell);
-		if (targetProperty.getDefinition().getDefinition().getConstraint(Reference.class)
-				.isReference()) {
-			final String associationTargetRef = getTargetFromSchema(targetProperty);
-			if (associationTargetRef != null) {
-				return new MappingValueBuilder().reference()
-						.referencedFeatureType(associationTargetRef)
-						.qualifiedTargetPath(lastValue.getQualifiedTargetPath())
-						.value(lastValue.getValue()).build();
-			}
-		}
-
-		return lastValue;
-	}
-
-	/**
-	 * Find the association target from the AppInfo annotation in the XSD
-	 * 
-	 * @param targetProperty target property to analyze
-	 * @return association target as String
-	 */
-	private String getTargetFromSchema(final Property targetProperty) {
-		if (targetProperty.getDefinition().getPropertyPath().isEmpty()) {
-			return null;
-		}
-
-		final ChildDefinition<?> firstChild = targetProperty.getDefinition().getPropertyPath()
-				.get(0).getChild();
-		if (!(firstChild instanceof PropertyDefinition)) {
-			return null;
-		}
-		final XmlAppInfo appInfoAnnotation = ((PropertyDefinition) firstChild)
-				.getConstraint(XmlAppInfo.class);
-
-		for (final XmlSchemaAppInfo appInfo : appInfoAnnotation.getAppInfos()) {
-			for (int i = 0; i < appInfo.getMarkup().getLength(); i++) {
-				final Node item = appInfo.getMarkup().item(i);
-				if ("targetElement".equals(item.getNodeName())) {
-					final String target = item.getTextContent();
-					return target;
-				}
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public final MappingValue handle(final Cell propertyCell) {
-		final Property targetProperty = XtraServerMappingUtils.getTargetProperty(propertyCell);
-		final Property sourceProperty = XtraServerMappingUtils.getSourceProperty(propertyCell);
-
-		if (targetProperty == null || (sourceProperty == null && !((this instanceof AssignHandler)
-				|| (this instanceof CustomFunctionAdvToNamespace)
-				|| (this instanceof SqlExpressionHandler)
-				|| (this instanceof FormattedStringHandler)))) {
-			CellParentWrapper cellParentWrapper = (CellParentWrapper) propertyCell;
-			mappingContext
-					.getReporter()
-					.warn("Cell could not be exported, source or target property is not set (Table: {0}, Source: {1}, Target: {2})",
-							cellParentWrapper.getTableName(), sourceProperty, targetProperty);
-			return null;
-		}
-
-		final Optional<MappingValue> optionalMappingValue = doHandle(propertyCell, targetProperty);
-
-		final String tableName = ((CellParentWrapper) propertyCell).getTableName();
-
-		optionalMappingValue.ifPresent(mappingValue -> {
-			mappingValue = ensureAssociationTarget(propertyCell, mappingValue);
-
-			mappingContext.addValueMappingToTable(targetProperty, mappingValue, tableName);
-		});
-
-		return optionalMappingValue.orElse(null);
-	}
-
-	protected abstract Optional<MappingValue> doHandle(final Cell propertyCell,
-			final Property targetProperty);
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTransformationHandlerFactory.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTransformationHandlerFactory.java
deleted file mode 100644
index 832dff0b61..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTransformationHandlerFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Map;
-import java.util.Objects;
-
-/**
- * Abstract Factory for creating Type and Property Transformation Handlers
- * 
- * @param <T> TransformationHandler
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-abstract class AbstractTransformationHandlerFactory<T extends TransformationHandler<?>> {
-
-	private final static boolean ignoreUnknownTransformations = true;
-
-	private final Map<String, T> handlers;
-	private final MappingContext mappingContext;
-
-	AbstractTransformationHandlerFactory(final MappingContext mappingContext,
-			final Map<String, T> handlers) {
-		this.mappingContext = mappingContext;
-		this.handlers = handlers;
-	}
-
-	/**
-	 * Create a new Transformation Type Handler
-	 * 
-	 * @param typeTransformationIdentifier type function identifier
-	 * @return new TypeHandler
-	 * @throws UnsupportedTransformationException if the transformation is not
-	 *             supported
-	 */
-	public T create(final String typeTransformationIdentifier)
-			throws UnsupportedTransformationException {
-		final T handler = handlers.get(Objects.requireNonNull(typeTransformationIdentifier,
-				"Type transformation identifier is null"));
-		if (handler == null) {
-			if (ignoreUnknownTransformations) {
-				mappingContext.getReporter().warn("Transformation not supported: {0}",
-						typeTransformationIdentifier);
-			}
-			else {
-				throw new UnsupportedTransformationException(typeTransformationIdentifier);
-			}
-		}
-		return handler;
-	}
-}
\ No newline at end of file
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTypeTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTypeTransformationHandler.java
deleted file mode 100644
index 4ace468524..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AbstractTypeTransformationHandler.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Collection;
-
-import javax.xml.namespace.QName;
-
-import org.geotools.filter.FilterFactoryImpl;
-import org.geotools.filter.text.cql2.CQL;
-import org.geotools.filter.text.cql2.CQLException;
-import org.geotools.filter.visitor.DuplicatingFilterVisitor;
-import org.opengis.filter.Filter;
-import org.opengis.filter.FilterFactory2;
-import org.opengis.filter.expression.PropertyName;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.MappingTableBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.EntityDefinition;
-import eu.esdihumboldt.hale.common.filter.AbstractGeotoolsFilter;
-import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
-import eu.esdihumboldt.hale.common.schema.model.constraint.type.PrimaryKey;
-import eu.esdihumboldt.hale.io.jdbc.constraints.DatabaseTable;
-import eu.esdihumboldt.hale.io.xsd.constraint.XmlElements;
-import eu.esdihumboldt.hale.io.xtraserver.compatibility.XtraServerCompatibilityMode;
-
-/**
- * Abstract Type Transformation Handler
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-abstract class AbstractTypeTransformationHandler implements TypeTransformationHandler {
-
-	protected final MappingContext mappingContext;
-
-	protected AbstractTypeTransformationHandler(final MappingContext mappingContext) {
-		this.mappingContext = mappingContext;
-	}
-
-	protected QName getFeatureTypeName(final Cell cell) {
-		final ListMultimap<String, ? extends Entity> targetEntities = cell.getTarget();
-		if (targetEntities == null || targetEntities.size() == 0) {
-			throw new IllegalStateException("No target type has been specified.");
-		}
-		final Entity targetType = targetEntities.values().iterator().next();
-		final TypeDefinition targetTypeDefinition = targetType.getDefinition().getType();
-		final XmlElements constraints = targetTypeDefinition.getConstraint(XmlElements.class);
-		if (constraints == null || constraints.getElements().size() == 0) {
-			throw new IllegalStateException("No constraint has been specified.");
-		}
-		else if (constraints.getElements().size() > 1) {
-			throw new IllegalStateException("More than one constraint has been specified.");
-		}
-		return constraints.getElements().iterator().next().getName();
-	}
-
-	protected String getPrimaryKey(final TypeDefinition definition) {
-		final PrimaryKey primaryKey = definition.getConstraint(PrimaryKey.class);
-		if (primaryKey == null || primaryKey.getPrimaryKeyPath() == null
-				|| primaryKey.getPrimaryKeyPath().isEmpty()) {
-			return null;
-		}
-		return primaryKey.getPrimaryKeyPath().iterator().next().getLocalPart();
-	}
-
-	protected MappingTableBuilder createTableIfAbsent(final EntityDefinition sourceType) {
-		final TypeDefinition sourceTypeDefinition = sourceType.getType();
-		final String tableName = sourceTypeDefinition.getDisplayName();
-
-		return this.mappingContext.getTable(tableName).orElseGet(() -> {
-			MappingTableBuilder table = new MappingTableBuilder();
-			final DatabaseTable dbTable = sourceTypeDefinition.getConstraint(DatabaseTable.class);
-			if (dbTable != null && dbTable.getTableName() != null) {
-				table.name(dbTable.getTableName());
-			}
-			else {
-				table.name(tableName);
-			}
-
-			final String primaryKey = getPrimaryKey(sourceTypeDefinition);
-			if (primaryKey != null) {
-				table.primaryKey(primaryKey);
-			}
-			else {
-				table.primaryKey("id");
-				mappingContext.getReporter().warn(
-						"No primary key for table \"{0}\" found, assuming \"id\". (context: oid_col in FeatureType \"{1}\")",
-						tableName, mappingContext.getFeatureTypeName());
-			}
-
-			if (sourceType.getFilter() != null) {
-				try {
-					AbstractGeotoolsFilter filter = (AbstractGeotoolsFilter) sourceType.getFilter();
-					// table.predicate(filter.getFilterTerm());
-					Filter qualifiedFilter = (Filter) CQL.toFilter(filter.getFilterTerm())
-							.accept(new ResolvePropertyNamesFilterVisitor("$T$"), null);
-					table.predicate(CQL.toCQL(qualifiedFilter));
-				} catch (ClassCastException | CQLException e) {
-					// ignore
-				}
-			}
-
-			mappingContext.addCurrentMappingTable(tableName, table);
-
-			return table;
-		});
-	}
-
-	@Override
-	public final FeatureTypeMapping handle(final Cell cell) {
-		mappingContext.addNextFeatureTypeMapping(getFeatureTypeName(cell));
-
-		final ListMultimap<String, ? extends Entity> sourceEntities = cell.getSource();
-		if (sourceEntities == null || sourceEntities.size() == 0) {
-			throw new IllegalStateException("No source type has been specified.");
-		}
-		if (XtraServerCompatibilityMode.hasFilters(cell.getSource())) {
-			mappingContext.getReporter().warn(
-					"Filters are not supported and are ignored during type transformation of Feature Type \"{0}\"",
-					mappingContext.getFeatureTypeName());
-		}
-
-		final ListMultimap<String, ? extends Entity> targetEntities = cell.getTarget();
-		if (targetEntities == null || targetEntities.size() == 0) {
-			throw new IllegalStateException("No target type has been specified.");
-		}
-		final Entity targetType = targetEntities.values().iterator().next();
-		final Collection<? extends Entity> sourceTypes = sourceEntities.values();
-		doHandle(sourceTypes, targetType, cell);
-
-		return null;
-	}
-
-	public abstract void doHandle(final Collection<? extends Entity> sourceTypes,
-			final Entity targetType, final Cell typeCell);
-
-	private class ResolvePropertyNamesFilterVisitor extends DuplicatingFilterVisitor {
-
-		final FilterFactory2 filterFactory = new FilterFactoryImpl();
-		final String tableName;
-
-		ResolvePropertyNamesFilterVisitor(String tableName) {
-			this.tableName = tableName;
-		}
-
-		@Override
-		public Object visit(PropertyName expression, Object extraData) {
-			return filterFactory.property(tableName + "." + expression.getPropertyName());
-		}
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AssignHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AssignHandler.java
deleted file mode 100644
index 5704e92364..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/AssignHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import static eu.esdihumboldt.hale.common.align.model.functions.AssignFunction.PARAMETER_VALUE;
-
-import java.util.List;
-import java.util.Optional;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.functions.AssignFunction;
-import eu.esdihumboldt.hale.common.align.model.impl.PropertyEntityDefinition;
-import eu.esdihumboldt.hale.common.schema.model.PropertyDefinition;
-import eu.esdihumboldt.hale.common.schema.model.constraint.property.NillableFlag;
-
-/**
- * Transforms the {@link AssignFunction} to a {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class AssignHandler extends AbstractPropertyTransformationHandler {
-
-	private final static String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-	private final static String NIL_REASON = "@nilReason";
-
-	AssignHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		// Assign constant value from parameters
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-		final List<ParameterValue> valueParams = parameters.get(PARAMETER_VALUE);
-		final String value = valueParams.get(0).getStringRepresentation();
-
-		final List<QName> path = buildPath(targetProperty.getDefinition().getPropertyPath());
-
-		// if nilReason is set and property is nillable, set xsi:nil to true
-		if (path.get(path.size() - 1).getLocalPart().equals(NIL_REASON)
-				&& isNillable(targetProperty.getDefinition())) {
-			final List<QName> nilPath = ImmutableList.<QName> builder()
-					.addAll(path.subList(0, path.size() - 1)).add(new QName(XSI_NS, "@nil"))
-					.build();
-			final MappingValue nilMappingValue = new MappingValueBuilder().constant()
-					.qualifiedTargetPath(nilPath).value("true").build();
-			final String tableName = ((CellParentWrapper) propertyCell).getTableName();
-			mappingContext.addValueMappingToTable(targetProperty, nilMappingValue, tableName);
-		}
-
-		final MappingValue mappingValue = new MappingValueBuilder().constant()
-				.qualifiedTargetPath(path).value(mappingContext.resolveProjectVars(value)).build();
-
-		return Optional.of(mappingValue);
-	}
-
-	private boolean isNillable(PropertyEntityDefinition definition) {
-
-		if (definition.getPropertyPath().size() > 1) {
-			final PropertyDefinition property = definition.getPropertyPath()
-					.get(definition.getPropertyPath().size() - 2).getChild().asProperty();
-			if (property != null) {
-				return property.getConstraint(NillableFlag.class).isEnabled();
-			}
-		}
-		return false;
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CellParentWrapper.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CellParentWrapper.java
deleted file mode 100644
index 26bf454554..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CellParentWrapper.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import static eu.esdihumboldt.hale.common.align.model.functions.JoinFunction.PARAMETER_JOIN;
-
-import java.util.List;
-import java.util.Set;
-
-import com.google.common.collect.ListMultimap;
-
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.EntityDefinition;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Priority;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.TransformationMode;
-import eu.esdihumboldt.hale.common.align.model.functions.JoinFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.join.JoinParameter;
-import eu.esdihumboldt.hale.io.jdbc.constraints.DatabaseTable;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Parameter decorator, that provides access to the parent cell
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class CellParentWrapper implements Cell {
-
-	private final Cell wrappedCell;
-	private final Cell parentTypeCell;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param parentTypeCell type cell
-	 * @param wrappedCell property cell
-	 */
-	public CellParentWrapper(final Cell parentTypeCell, final Cell wrappedCell) {
-		this.parentTypeCell = parentTypeCell;
-		this.wrappedCell = wrappedCell;
-	}
-
-	/**
-	 * Returns the parent type cell
-	 * 
-	 * @return type cell
-	 */
-	public Cell getParentCell() {
-		return parentTypeCell;
-	}
-
-	/**
-	 * Returns the type mapping cell representation
-	 * 
-	 * @return type mapping cell representation
-	 */
-	public Entity getParentCellSource() {
-		ListMultimap<String, ? extends Entity> sourceEntities = parentTypeCell.getSource();
-		if (sourceEntities != null && !sourceEntities.isEmpty()) {
-			return sourceEntities.values().iterator().next();
-		}
-		return null;
-	}
-
-	private EntityDefinition getParentCellSourceType() {
-		if (parentTypeCell.getTransformationIdentifier().equals(JoinFunction.ID)) {
-			List<ParameterValue> parameters = parentTypeCell.getTransformationParameters().get(
-					PARAMETER_JOIN);
-			if (!parameters.isEmpty()) {
-				final JoinParameter joinParameter = parameters.get(0).as(JoinParameter.class);
-				return joinParameter.getTypes().iterator().next();
-			}
-		}
-
-		return getParentCellSource().getDefinition();
-	}
-
-	/**
-	 * Returns the table name of the property cell or the parent type cell. If
-	 * the source of the alignment is not a database schema, the name of the
-	 * type is returned.
-	 * 
-	 * @return table name
-	 */
-	public String getTableName() {
-		final Property sourceProperty = XtraServerMappingUtils.getSourceProperty(wrappedCell);
-		if (sourceProperty != null) {
-			final DatabaseTable table = sourceProperty.getDefinition().getDefinition()
-					.getParentType().getConstraint(DatabaseTable.class);
-			if (table.isTable()) {
-				return table.getTableName();
-			}
-			else {
-				final DatabaseTable tableOfType = sourceProperty.getDefinition().getType()
-						.getConstraint(DatabaseTable.class);
-				if (tableOfType.isTable()) {
-					return table.getTableName();
-				}
-				else {
-					return sourceProperty.getDefinition().getType().getDisplayName();
-				}
-			}
-		}
-		final EntityDefinition sourceType = getParentCellSourceType();
-		final DatabaseTable table = sourceType.getType().getConstraint(DatabaseTable.class);
-		if (!table.isTable()) {
-			return sourceType.getType().getDisplayName();
-		}
-		else {
-			return table.getTableName();
-		}
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getSource()
-	 */
-	@Override
-	public ListMultimap<String, ? extends Entity> getSource() {
-		return wrappedCell.getSource();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getTarget()
-	 */
-	@Override
-	public ListMultimap<String, ? extends Entity> getTarget() {
-		return wrappedCell.getTarget();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getTransformationParameters()
-	 */
-	@Override
-	public ListMultimap<String, ParameterValue> getTransformationParameters() {
-		return wrappedCell.getTransformationParameters();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getAnnotations(java.lang.String)
-	 */
-	@Override
-	public List<?> getAnnotations(String type) {
-		return wrappedCell.getAnnotations(type);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getAnnotationTypes()
-	 */
-	@Override
-	public Set<String> getAnnotationTypes() {
-		return wrappedCell.getAnnotationTypes();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#addAnnotation(java.lang.String)
-	 */
-	@Override
-	public Object addAnnotation(String type) {
-		return wrappedCell.addAnnotation(type);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#addAnnotation(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	@Override
-	public void addAnnotation(String type, Object annotation) {
-		wrappedCell.addAnnotation(type, annotation);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#removeAnnotation(java.lang.String,
-	 *      java.lang.Object)
-	 */
-	@Override
-	public void removeAnnotation(String type, Object annotation) {
-		wrappedCell.removeAnnotation(type, annotation);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getDocumentation()
-	 */
-	@Override
-	public ListMultimap<String, String> getDocumentation() {
-		return wrappedCell.getDocumentation();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getTransformationIdentifier()
-	 */
-	@Override
-	public String getTransformationIdentifier() {
-		return wrappedCell.getTransformationIdentifier();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getId()
-	 */
-	@Override
-	public String getId() {
-		return wrappedCell.getId();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getDisabledFor()
-	 */
-	@Override
-	public Set<String> getDisabledFor() {
-		return wrappedCell.getDisabledFor();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getPriority()
-	 */
-	@Override
-	public Priority getPriority() {
-		return wrappedCell.getPriority();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#getTransformationMode()
-	 */
-	@Override
-	public TransformationMode getTransformationMode() {
-		return wrappedCell.getTransformationMode();
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.common.align.model.Cell#isBaseCell()
-	 */
-	@Override
-	public boolean isBaseCell() {
-		return wrappedCell.isBaseCell();
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/ClassificationMappingHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/ClassificationMappingHandler.java
deleted file mode 100644
index d27eb73afd..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/ClassificationMappingHandler.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder.ValueClassification;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.functions.ClassificationMappingFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.ClassificationMappingUtil;
-import eu.esdihumboldt.hale.common.core.io.Value;
-import eu.esdihumboldt.hale.common.core.service.ServiceManager;
-import eu.esdihumboldt.hale.common.lookup.LookupTable;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the {@link ClassificationMappingFunction} to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class ClassificationMappingHandler extends AbstractPropertyTransformationHandler {
-
-	private final static String NIL_REASON = "@nilReason";
-
-	ClassificationMappingHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		final ValueClassification mappingValue;
-
-		final List<QName> path = buildPath(targetProperty.getDefinition().getPropertyPath());
-
-		if (path.get(path.size() - 1).getLocalPart().equals(NIL_REASON)) {
-			mappingValue = new MappingValueBuilder().nil();
-			mappingValue.qualifiedTargetPath(path.subList(0, path.size() - 1));
-		}
-		else {
-			mappingValue = new MappingValueBuilder().classification();
-			mappingValue.qualifiedTargetPath(path);
-		}
-
-		mappingValue.value(propertyName(XtraServerMappingUtils.getSourceProperty(propertyCell)
-				.getDefinition().getPropertyPath()));
-
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-
-		// Assign DB codes and values from the lookup table
-		final LookupTable lookup = ClassificationMappingUtil.getClassificationLookup(parameters,
-				new ServiceManager(ServiceManager.SCOPE_PROJECT));
-		if (lookup != null) {
-			final Map<Value, Value> valueMap = lookup.asMap();
-			final Iterator<Value> it = valueMap.keySet().iterator();
-			while (it.hasNext()) {
-				final Value sourceValue = it.next();
-				final String targetValueStr = '\'' + valueMap.get(sourceValue).as(String.class) + '\'';
-
-				mappingValue.keyValue(sourceValue.as(String.class), targetValueStr);
-			}
-		}
-		else {
-			mappingValue.keyValue("NULL", "");
-		}
-
-		return Optional.of(mappingValue.build());
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToGeographicalNameSimple.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToGeographicalNameSimple.java
deleted file mode 100644
index 54b7157061..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToGeographicalNameSimple.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.core.io.Value;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * * Transforms the custom function
- * 'custom:alignment:adv.inspire.GeographicalName.simple' to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class CustomFunctionAdvToGeographicalNameSimple extends FormattedStringHandler {
-
-	public final static String FUNCTION_ID = "custom:alignment:adv.inspire.GeographicalName.simple";
-	private final static String XSI_NS = "http://www.w3.org/2001/XMLSchema-instance";
-	private final static String XLINK_NS = "http://www.w3.org/1999/xlink";
-
-	CustomFunctionAdvToGeographicalNameSimple(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-
-		final List<QName> geographicalNamePath = buildPath(targetProperty.getDefinition()
-				.getPropertyPath());
-
-		final MappingValue mappingValue = new MappingValueBuilder()
-				.column()
-				.qualifiedTargetPath(
-						addToPath(geographicalNamePath, "spelling", "SpellingOfName", "text"))
-				.value(propertyName(XtraServerMappingUtils.getSourceProperty(propertyCell)
-						.getDefinition().getPropertyPath())).build();
-
-		final List<MappingValue> constantValues = new ArrayList<MappingValue>();
-
-		constantValues.add(createConstantValueMapping(addToPath(geographicalNamePath, "language"),
-				"deu"));
-
-		final String nativenessParam = getSingleProperty(parameters, "nativeness");
-		setCodeListValue(addToPath(geographicalNamePath, "nativeness"), "NativenessValue",
-				nativenessParam, "endonym", constantValues);
-
-		final String nameStatusParam = getSingleProperty(parameters, "nameStatus");
-		setCodeListValue(addToPath(geographicalNamePath, "nameStatus"), "NameStatusValue",
-				nameStatusParam, "official", constantValues);
-
-		// Determine source with priorities: source first, ADV_MODELLART project
-		// property, AA_Modellart.advStandardModell
-		final String sourceParam = getSingleProperty(parameters, "source");
-		final String sourceOfName;
-		if (sourceParam != null) {
-			sourceOfName = sourceParam;
-		}
-		else {
-			final Value projectPropertySource = this.mappingContext
-					.getTransformationProperty(MappingContext.PROPERTY_ADV_MODELLART);
-			if (!projectPropertySource.isEmpty()) {
-				sourceOfName = projectPropertySource.as(String.class);
-			}
-			else {
-				sourceOfName = "unknown";
-			}
-		}
-		constantValues.add(createConstantValueMapping(
-				addToPath(geographicalNamePath, "sourceOfName"), sourceOfName));
-
-		constantValues
-				.add(createConstantValueMapping(
-						addToPath(XSI_NS, addToPath(geographicalNamePath, "pronunciation"), "@nil"),
-						"true"));
-		constantValues.add(createConstantValueMapping(
-				addToPath("", addToPath(geographicalNamePath, "pronunciation"), "@nilReason"),
-				"other:unpopulated"));
-
-		constantValues.add(createConstantValueMapping(
-				addToPath(geographicalNamePath, "spelling", "SpellingOfName", "script"), "Latn"));
-
-		final String tableName = ((CellParentWrapper) propertyCell).getTableName();
-
-		constantValues.forEach(c -> mappingContext.addValueMappingToTable(targetProperty, c,
-				tableName));
-
-		return Optional.of(mappingValue);
-	}
-
-	private void setCodeListValue(final List<QName> propertyPath, final String codeListValue,
-			final String code, final String fallbackValue, final List<MappingValue> constantValues) {
-		if (code == null) {
-			// default if not specified
-			constantValues.add(createConstantValueMapping(
-					addToPath(XLINK_NS, propertyPath, "@href"),
-					"http://inspire.ec.europa.eu/codelist/" + codeListValue + "/" + fallbackValue));
-		}
-		else {
-			if ("unpopulated".equals(code)) {
-				constantValues.add(createConstantValueMapping(
-						addToPath("", propertyPath, "@nilReason"), "other:unpopulated"));
-				constantValues.add(createConstantValueMapping(
-						addToPath(XSI_NS, propertyPath, "@nil"), "true"));
-			}
-			else if ("unknown".equals(code)) {
-				constantValues.add(createConstantValueMapping(
-						addToPath("", propertyPath, "@nilReason"), "unknown"));
-				constantValues.add(createConstantValueMapping(
-						addToPath(XSI_NS, propertyPath, "@nil"), "true"));
-			}
-			else {
-				constantValues.add(createConstantValueMapping(
-						addToPath(XLINK_NS, propertyPath, "@href"),
-						"http://inspire.ec.europa.eu/codelist/" + codeListValue + "/" + code));
-			}
-		}
-	}
-
-	private List<QName> addToPath(final List<QName> basePath, final String... elements) {
-		final String gnNamespaceUri = basePath.get(basePath.size() - 1).getNamespaceURI();
-
-		return addToPath(gnNamespaceUri, basePath, elements);
-	}
-
-	private List<QName> addToPath(final String namespaceUri, final List<QName> basePath,
-			final String... elements) {
-		return Stream.concat(basePath.stream(),
-				Arrays.stream(elements).map(element -> new QName(namespaceUri, element))).collect(
-				Collectors.toList());
-	}
-
-	private MappingValue createConstantValueMapping(final List<QName> target, final String value) {
-		return new MappingValueBuilder().constant().qualifiedTargetPath(target).value(value)
-				.build();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToIdentifier.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToIdentifier.java
deleted file mode 100644
index 78185027f0..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToIdentifier.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.List;
-import java.util.Optional;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ImmutableList;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder.ValueDefault;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.core.io.Value;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the custom function 'custom:alignment:adv.inspire.identifier' to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class CustomFunctionAdvToIdentifier extends FormattedStringHandler {
-
-	public final static String FUNCTION_ID = "custom:alignment:adv.inspire.identifier";
-
-	CustomFunctionAdvToIdentifier(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		final Value inspireNamespace = mappingContext
-				.getTransformationProperty(MappingContext.PROPERTY_INSPIRE_NAMESPACE);
-
-		final String propertyName = propertyName(XtraServerMappingUtils
-				.getSourceProperty(propertyCell).getDefinition().getPropertyPath());
-
-		String value = "'";
-		if (!inspireNamespace.isEmpty()) {
-			value += inspireNamespace.as(String.class)
-					+ (inspireNamespace.as(String.class).endsWith("/") ? "" : "/");
-		}
-		value += mappingContext.getFeatureTypeName() + "_' || $T$." + propertyName;
-
-		final List<QName> propPath = buildPath(targetProperty.getDefinition().getPropertyPath());
-
-		final ValueDefault mappingValue = new MappingValueBuilder().expression()
-				.qualifiedTargetPath(propPath).value(value);
-
-		// Add codespace
-		final List<QName> codespacePath = ImmutableList.<QName> builder().addAll(propPath)
-				.add(new QName("@codeSpace")).build();
-		final MappingValue codeSpaceValue = new MappingValueBuilder().constant()
-				.qualifiedTargetPath(codespacePath).value("http://inspire.ec.europa.eu/ids")
-				.build();
-		final String tableName = ((CellParentWrapper) propertyCell).getTableName();
-		mappingContext.addValueMappingToTable(targetProperty, codeSpaceValue, tableName);
-
-		return Optional.of(mappingValue.build());
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToLocalId.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToLocalId.java
deleted file mode 100644
index 7c38420987..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToLocalId.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the custom function 'custom:alignment:adv.inspire.id.default' to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class CustomFunctionAdvToLocalId extends FormattedStringHandler {
-
-	public final static String FUNCTION_ID = "custom:alignment:adv.inspire.id.default";
-
-	CustomFunctionAdvToLocalId(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		final String propertyName = propertyName(XtraServerMappingUtils
-				.getSourceProperty(propertyCell).getDefinition().getPropertyPath());
-
-		final MappingValue mappingValue = new MappingValueBuilder().expression()
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value("'" + mappingContext.getFeatureTypeName() + "_' || $T$." + propertyName)
-				.build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToNamespace.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToNamespace.java
deleted file mode 100644
index 4012cd5ae8..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToNamespace.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.core.io.Value;
-
-/**
- * Transforms the custom function 'custom:alignment:adv.inspire.namespace' to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class CustomFunctionAdvToNamespace extends FormattedStringHandler {
-
-	public final static String FUNCTION_ID = "custom:alignment:adv.inspire.namespace";
-
-	CustomFunctionAdvToNamespace(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-		final Value inspireNamespace = mappingContext
-				.getTransformationProperty(MappingContext.PROPERTY_INSPIRE_NAMESPACE);
-		if (!inspireNamespace.isEmpty()) {
-			final MappingValue mappingValue = new MappingValueBuilder().constant()
-					.qualifiedTargetPath(
-							buildPath(targetProperty.getDefinition().getPropertyPath()))
-					.value(inspireNamespace.as(String.class)).build();
-			return Optional.of(mappingValue);
-		}
-
-		return Optional.empty();
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToUCUM.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToUCUM.java
deleted file mode 100644
index fcd3fc6161..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/CustomFunctionAdvToUCUM.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the custom function 'custom:alignment:adv.uom.toucum' to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class CustomFunctionAdvToUCUM extends ClassificationMappingHandler {
-
-	public final static String FUNCTION_ID = "custom:alignment:adv.uom.toucum";
-
-	CustomFunctionAdvToUCUM(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-		final MappingValue mappingValue = new MappingValueBuilder()
-				.classification()
-				.keyValue("urn:adv:uom:m2", "'m2'")
-				.keyValue("urn:adv:uom:m", "'m'")
-				.keyValue("urn:adv:uom:km", "'km'")
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value(propertyName(XtraServerMappingUtils.getSourceProperty(propertyCell)
-						.getDefinition().getPropertyPath())).build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/FormattedStringHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/FormattedStringHandler.java
deleted file mode 100644
index 3300de97e6..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/FormattedStringHandler.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.functions.FormattedStringFunction;
-
-/**
- * Transforms the {@link FormattedStringFunction} to a {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class FormattedStringHandler extends AbstractPropertyTransformationHandler {
-
-	private static final Pattern VARIABLE_PATTERN = Pattern.compile("\\{([^$].+?)\\}");
-	private static final String XS_VAR_PREFIX = "$T$.";
-	private static final String XS_CONCAT = " || ";
-	private static final String XS_CONCAT_LEFT_STR = "' || ";
-	private static final String XS_CONCAT_RIGHT_STR = " || '";
-
-	FormattedStringHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		// Get the formatted string from parameters
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-		final List<ParameterValue> patterns = parameters.get("pattern");
-		if (patterns == null || patterns.isEmpty() || patterns.get(0).isEmpty()) {
-			mappingContext.getReporter().warn("Formatted string was ignored, no pattern set.");
-			return Optional.empty();
-		}
-		final String pattern = patterns.get(0).as(String.class);
-		final StringBuilder formattedStr = new StringBuilder(
-				mappingContext.resolveProjectVars(pattern));
-		final int patternLength = formattedStr.length();
-
-		if (propertyCell.getSource() != null && propertyCell.getSource().asMap().get("var") != null
-				&& !propertyCell.getSource().asMap().get("var").isEmpty()) {
-			final List<String> variables = propertyCell.getSource().asMap().get("var").stream()
-					.map(var -> propertyName(var.getDefinition().getPropertyPath()))
-					.collect(Collectors.toList());
-			final List<int[]> startEndList = new ArrayList<int[]>();
-			final List<String> varList = new ArrayList<String>();
-			final Matcher m = VARIABLE_PATTERN.matcher(formattedStr);
-			while (m.find()) {
-				int[] startEnd = new int[2];
-				startEnd[0] = m.start(); // index of '{' character
-				startEnd[1] = m.end(); // index of '}' character
-				startEndList.add(startEnd);
-				varList.add(m.group(1)); // the variable name, without curly
-											// braces
-			}
-
-			List<String> missingVars = varList.stream().filter(var -> !variables.contains(var))
-					.collect(Collectors.toList());
-			if (!missingVars.isEmpty()) {
-				mappingContext.getReporter().warn("Formatted string was ignored. Variables \""
-						+ missingVars
-						+ "\" were used in pattern, but do not exist in source properties.");
-				return Optional.empty();
-			}
-
-			if (!startEndList.isEmpty()) {
-				final StringBuilder varBuilder = new StringBuilder();
-				int idxOffset = 0;
-
-				// Add ' if string does not start with a variable definition
-				if (startEndList.get(0)[0] != 0) {
-					formattedStr.insert(0, '\'');
-					varBuilder.append(XS_CONCAT_LEFT_STR);
-					idxOffset++;
-				}
-				int firstStartIdx = startEndList.get(0)[0] + idxOffset;
-				int firstEndIdx = startEndList.get(0)[1] + idxOffset;
-				varBuilder.append(XS_VAR_PREFIX);
-				varBuilder.append(varList.get(0));
-				if (firstEndIdx - idxOffset != pattern.length()) {
-					rightConcat(varBuilder, 0, startEndList);
-					if (varList.size() == 1) {
-						formattedStr.append('\'');
-					}
-				}
-				formattedStr.replace(firstStartIdx, firstEndIdx, varBuilder.toString());
-				idxOffset += varBuilder.length() - firstEndIdx + firstStartIdx;
-				varBuilder.setLength(0);
-
-				if (varList.size() > 1) {
-					for (int i = 1; i < startEndList.size(); i++) {
-						final int startIdx = startEndList.get(i)[0] + idxOffset;
-						final int endIdx = startEndList.get(i)[1] + idxOffset;
-						leftConcat(varBuilder, i, startEndList);
-						varBuilder.append(XS_VAR_PREFIX);
-						varBuilder.append(varList.get(i));
-						rightConcat(varBuilder, i, startEndList);
-						formattedStr.replace(startIdx, endIdx, varBuilder.toString());
-						idxOffset += varBuilder.length() - endIdx + startIdx;
-						varBuilder.setLength(0);
-					}
-					// Remove || ' after the last variable or append ' after the
-					// last string
-					if (startEndList.get(startEndList.size() - 1)[1] == patternLength) {
-						formattedStr
-								.setLength(formattedStr.length() - XS_CONCAT_RIGHT_STR.length());
-					}
-					else {
-						formattedStr.append(XS_CONCAT_LEFT_STR);
-					}
-				}
-			}
-		}
-		else {
-			formattedStr.insert(0, '\'');
-			// Simple string without formatting
-			formattedStr.append('\'');
-		}
-
-		final MappingValue mappingValue = new MappingValueBuilder().expression()
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value(formattedStr.toString()).build();
-
-		return Optional.of(mappingValue);
-	}
-
-	private static void leftConcat(final StringBuilder builder, final int currentIdx,
-			final List<int[]> startEndList) {
-		if (startEndList.get(currentIdx)[0] == startEndList.get(currentIdx - 1)[1]) {
-			builder.append(XS_CONCAT);
-		}
-		else {
-			builder.append(XS_CONCAT_LEFT_STR);
-		}
-	}
-
-	private static void rightConcat(final StringBuilder builder, final int currentIdx,
-			final List<int[]> startEndList) {
-		if (currentIdx + 1 < startEndList.size()) {
-			if (startEndList.get(currentIdx)[1] != startEndList.get(currentIdx + 1)[0]) {
-				builder.append(XS_CONCAT_RIGHT_STR);
-			}
-		}
-		else {
-			builder.append(XS_CONCAT_RIGHT_STR);
-		}
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/GroovyJoinHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/GroovyJoinHandler.java
deleted file mode 100644
index 7c2f3b5e50..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/GroovyJoinHandler.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Collection;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-
-/**
- * Transforms the eu.esdihumboldt.cst.functions.groovy.join function to a
- * {@link FeatureTypeMapping}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class GroovyJoinHandler extends JoinHandler {
-
-	GroovyJoinHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public void doHandle(final Collection<? extends Entity> sourceTypes, final Entity targetType,
-			final Cell typeCell) {
-		try {
-			super.doHandle(sourceTypes, targetType, typeCell);
-		} catch (final Exception e) {
-			mappingContext.getReporter().error("Error transforming GroovyJoin for Feature Type {0}."
-					+ " Replace the GroovyJoin with a Join before you transform the Alignment.",
-					mappingContext.getFeatureTypeName());
-			throw e;
-		}
-		mappingContext.getReporter()
-				.warn("A GroovyJoin for Feature Type {0} has been transformed but requires further"
-						+ " manual editing in the generated Mapping file.",
-						mappingContext.getFeatureTypeName());
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/JoinHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/JoinHandler.java
deleted file mode 100644
index 7951d81009..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/JoinHandler.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import static eu.esdihumboldt.hale.common.align.model.functions.JoinFunction.PARAMETER_JOIN;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.MappingJoin;
-import de.interactive_instruments.xtraserver.config.api.MappingJoin.Condition;
-import de.interactive_instruments.xtraserver.config.api.MappingJoinBuilder;
-import de.interactive_instruments.xtraserver.config.api.MappingTableBuilder;
-import eu.esdihumboldt.hale.common.align.model.AlignmentUtil;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.functions.JoinFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.join.JoinParameter;
-import eu.esdihumboldt.hale.common.align.model.functions.join.JoinParameter.JoinCondition;
-import eu.esdihumboldt.hale.common.align.model.impl.TypeEntityDefinition;
-
-/**
- * Transforms the {@link JoinFunction} to a {@link FeatureTypeMapping}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class JoinHandler extends AbstractTypeTransformationHandler {
-
-	JoinHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public void doHandle(final Collection<? extends Entity> sourceTypes, final Entity targetType,
-			final Cell typeCell) {
-
-		for (final ParameterValue transParam : typeCell.getTransformationParameters()
-				.get(PARAMETER_JOIN)) {
-
-			final JoinParameter joinParameter = transParam.as(JoinParameter.class);
-			final String validation = joinParameter.validate();
-			if (validation != null) {
-				throw new IllegalArgumentException("Join parameter invalid: " + validation);
-			}
-
-			final MappingTableBuilder baseTable = createTableIfAbsent(
-					joinParameter.getTypes().iterator().next());
-
-			final List<Condition> sortedConditions = transformSortedConditions(joinParameter,
-					sourceTypes);
-
-			// TODO: add nested joined tables to merged tables
-
-			List<String> sourceTables = new ArrayList<>();
-
-			sourceTables.add(baseTable.buildDraft().getName());
-
-			while (!sourceTables.isEmpty()) {
-				List<String> nextSourceTables = new ArrayList<>();
-				for (String tableName : sourceTables) {
-					final List<MappingJoin> joins = sortedConditions.stream()
-							.filter(condition -> condition.getSourceTable().equals(tableName))
-							.map(condition -> {
-								final MappingJoinBuilder join = new MappingJoinBuilder();
-								join.joinCondition(condition);
-								join.targetPath("TODO");
-								return join.build();
-							}).collect(Collectors.toList());
-
-					joins.forEach(joinPath -> {
-						mappingContext.getTable(joinPath.getTargetTable())
-								.ifPresent(targetTable -> targetTable.joinPath(joinPath));
-					});
-
-					nextSourceTables.addAll(joins.stream().map(st -> st.getTargetTable())
-							.collect(Collectors.toList()));
-				}
-				sourceTables = nextSourceTables;
-			}
-		}
-	}
-
-	/**
-	 * Transform and sort hale Join Condition Set into Join Conditions that are
-	 * attached to multiple XtraServer Join objects
-	 * 
-	 * @param joinParameter hale conditions
-	 * @param sourceTypes source types from cell with primary keys
-	 * @return sorted joins
-	 */
-	private List<Condition> transformSortedConditions(final JoinParameter joinParameter,
-			final Collection<? extends Entity> sourceTypes) {
-
-		return joinParameter.getConditions().stream().sorted(new Comparator<JoinCondition>() {
-
-			@Override
-			public int compare(JoinCondition o1, JoinCondition o2) {
-				TypeEntityDefinition o1Type = AlignmentUtil.getTypeEntity(o1.joinProperty);
-				TypeEntityDefinition o2Type = AlignmentUtil.getTypeEntity(o2.joinProperty);
-				return joinParameter.getTypes().indexOf(o1Type)
-						- joinParameter.getTypes().indexOf(o2Type);
-			}
-		}).map(condition -> {
-			final TypeEntityDefinition baseType = AlignmentUtil
-					.getTypeEntity(condition.baseProperty);
-
-			final TypeEntityDefinition joinType = sourceTypes.stream()
-					.filter(entity -> entity.getDefinition().getType().getName()
-							.equals(condition.joinProperty.getType().getName()))
-					.map(entity -> AlignmentUtil.getTypeEntity(entity.getDefinition())).findFirst()
-					.orElse(AlignmentUtil.getTypeEntity(condition.joinProperty));
-
-			final MappingTableBuilder baseTable = createTableIfAbsent(baseType);
-			final String baseField = condition.baseProperty.getPropertyPath().iterator().next()
-					.getChild().getDisplayName();
-			final MappingTableBuilder joinTable = createTableIfAbsent(joinType);
-			final String joinField = condition.joinProperty.getPropertyPath().iterator().next()
-					.getChild().getDisplayName();
-
-			final MappingJoin.Condition mappingJoinCondition = new MappingJoinBuilder.ConditionBuilder()
-					.sourceTable(baseTable.buildDraft().getName()).sourceField(baseField)
-					.targetTable(joinTable.buildDraft().getName()).targetField(joinField).build();
-
-			return mappingJoinCondition;
-		}).collect(Collectors.toList());
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MappingContext.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MappingContext.java
deleted file mode 100644
index 314b3d6170..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MappingContext.java
+++ /dev/null
@@ -1,390 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMappingBuilder;
-import de.interactive_instruments.xtraserver.config.api.MappingTable;
-import de.interactive_instruments.xtraserver.config.api.MappingTableBuilder;
-import de.interactive_instruments.xtraserver.config.api.MappingTableBuilder.MappingTableDraft;
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.XtraServerMapping;
-import de.interactive_instruments.xtraserver.config.api.XtraServerMappingBuilder;
-import de.interactive_instruments.xtraserver.config.transformer.XtraServerMappingTransformer;
-import eu.esdihumboldt.hale.common.align.model.Alignment;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ChildContext;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.core.io.Value;
-import eu.esdihumboldt.hale.common.core.io.project.ProjectInfo;
-import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
-import eu.esdihumboldt.hale.common.schema.model.PropertyDefinition;
-import eu.esdihumboldt.hale.common.schema.model.Schema;
-import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
-import eu.esdihumboldt.hale.common.schema.model.constraint.property.Cardinality;
-
-/**
- * The mapping context provides access to the {@link Alignment} and holds all
- * {@link FeatureTypeMapping}s.
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public final class MappingContext {
-
-	/**
-	 * ADV Modellart
-	 */
-	public final static String PROPERTY_ADV_MODELLART = "ADV_MODELLART";
-
-	/**
-	 * INSPIRE namespace
-	 */
-	public final static String PROPERTY_INSPIRE_NAMESPACE = "INSPIRE_NAMESPACE";
-
-	private final Alignment alignment;
-	private final Map<String, Value> transformationProperties;
-	private final static Pattern projectVarPattern = Pattern.compile("\\{\\{project:([^}]+)\\}\\}");
-
-	private final Map<String, FeatureTypeMappingBuilder> featureTypeMappings = new LinkedHashMap<>();
-	private FeatureTypeMappingBuilder currentFeatureTypeMapping;
-	private String currentFeatureTypeMappingName;
-	private final Map<String, MappingTableBuilder> currentMappingTables = new LinkedHashMap<>();
-	private final Set<String> missingAssociationTargets = new TreeSet<String>();
-	private final URI applicationSchemaUri;
-	private final ProjectInfo projectInfo;
-	private final URI projectLocation;
-	private final IOReporter reporter;
-
-	/**
-	 * Constructor Only the first schema is used
-	 * 
-	 * @param alignment the Alignment with all cells
-	 * @param schemaspace the target schema
-	 * @param transformationProperties Properties used in transformations
-	 * @param projectInfo project info
-	 * @param projectLocation project file
-	 * @param reporter reporter
-	 */
-	public MappingContext(final Alignment alignment, final SchemaSpace schemaspace,
-			final Map<String, Value> transformationProperties, final ProjectInfo projectInfo,
-			final URI projectLocation, final IOReporter reporter) {
-		this.alignment = Objects.requireNonNull(alignment);
-		this.transformationProperties = Objects.requireNonNull(transformationProperties);
-
-		final Iterator<? extends Schema> it = Objects
-				.requireNonNull(schemaspace, "Schemaspace not provided").getSchemas().iterator();
-		if (!it.hasNext()) {
-			throw new IllegalArgumentException("Schemaspace does not contain a schema");
-		}
-		final Schema schema = it.next();
-		this.applicationSchemaUri = schema.getLocation();
-		this.projectInfo = projectInfo;
-		this.projectLocation = projectLocation;
-		this.reporter = reporter;
-	}
-
-	/**
-	 * Add a new FeatureTypeMapping to the mapping context
-	 * 
-	 * @param featureTypeName feature type name
-	 * @return the same FeatureTypeMapping for chaining method calls
-	 */
-	FeatureTypeMappingBuilder addNextFeatureTypeMapping(final QName featureTypeName) {
-		buildAndClearCurrentTables();
-
-		final String key = Objects.requireNonNull(featureTypeName, "Feature Type name is null")
-				.toString();
-		currentFeatureTypeMapping = featureTypeMappings.get(key);
-		if (currentFeatureTypeMapping == null) {
-			currentFeatureTypeMapping = new FeatureTypeMappingBuilder()
-					.qualifiedName(featureTypeName);
-			featureTypeMappings.put(key, currentFeatureTypeMapping);
-		}
-
-		this.currentFeatureTypeMappingName = featureTypeName.getLocalPart();
-
-		return currentFeatureTypeMapping;
-	}
-
-	void addCurrentMappingTable(final String tableName, final MappingTableBuilder mappingTable) {
-		this.currentMappingTables.put(tableName, mappingTable);
-	}
-
-	Collection<MappingTableBuilder> getCurrentMappingTables() {
-		return this.currentMappingTables.values();
-	}
-
-	void buildAndClearCurrentTables() {
-		if (this.currentFeatureTypeMapping == null) {
-			return;
-		}
-
-		// reset target path for merged tables
-		this.currentMappingTables.values().forEach(tableBuilder -> {
-			if (tableBuilder.buildDraft().getQualifiedTargetPath()
-					.equals(ImmutableList.of(new QName("__MERGE__")))) {
-				tableBuilder.qualifiedTargetPath(ImmutableList.of());
-			}
-		});
-
-		// connect joining tables
-		Lists.reverse(Lists.newArrayList(this.currentMappingTables.values())).stream()
-				.filter(isJoinTable()).map(MappingTableBuilder::build).forEach(table -> {
-					if (this.currentMappingTables
-							.containsKey(table.getJoinPaths().iterator().next().getSourceTable())) {
-						this.currentMappingTables
-								.get(table.getJoinPaths().iterator().next().getSourceTable())
-								.joiningTable(table);
-					}
-				});
-
-		final Optional<MappingTable> primaryTable = this.currentMappingTables.values().stream()
-				.map(MappingTableBuilder::build).filter(table -> table.isPrimary()).findFirst();
-
-		if (primaryTable.isPresent()) {
-			this.currentFeatureTypeMapping.primaryTable(primaryTable.get());
-		}
-
-		this.currentMappingTables.clear();
-	}
-
-	private Predicate<MappingTableBuilder> isValidJoinTable() {
-		return tableBuilder -> tableBuilder.buildDraft().isJoined()
-				&& tableBuilder.buildDraft().getAllValuesStream().findFirst().isPresent()
-				&& tableBuilder.buildDraft().getAllValuesStream()
-						.allMatch(value -> value.getQualifiedTargetPath().get(0)
-								.equals(tableBuilder.buildDraft().getQualifiedTargetPath().get(0)));
-	}
-
-	private Predicate<MappingTableBuilder> isInvalidJoinTableWithoutTarget() {
-		return tableBuilder -> !tableBuilder.buildDraft().getJoinPaths().isEmpty()
-				&& tableBuilder.buildDraft().getAllValuesStream().findFirst().isPresent()
-				&& (tableBuilder.buildDraft().getQualifiedTargetPath().isEmpty() || tableBuilder
-						.buildDraft().getAllValuesStream()
-						.anyMatch(value -> !value.getQualifiedTargetPath().get(0).equals(
-								tableBuilder.buildDraft().getQualifiedTargetPath().get(0))));
-	}
-
-	private Predicate<MappingTableBuilder> isJoinTable() {
-		return tableBuilder -> (tableBuilder.buildDraft().isJoined()
-				&& tableBuilder.buildDraft().getAllValuesStream().findFirst().isPresent()
-				&& tableBuilder.buildDraft().getAllValuesStream()
-						.allMatch(value -> value.getQualifiedTargetPath().get(0)
-								.equals(tableBuilder.buildDraft().getQualifiedTargetPath().get(0))))
-				|| (!tableBuilder.buildDraft().getJoinPaths().isEmpty()
-						&& tableBuilder.buildDraft().getAllValuesStream().findFirst().isPresent()
-						&& (tableBuilder.buildDraft().getQualifiedTargetPath().isEmpty()
-								|| tableBuilder.buildDraft().getAllValuesStream()
-										.anyMatch(value -> !value.getQualifiedTargetPath().get(0)
-												.equals(tableBuilder.buildDraft()
-														.getQualifiedTargetPath().get(0)))));
-	}
-
-	/**
-	 * Returns the name of the currently processed Feature Type Mapping
-	 * 
-	 * @return Feature Type Mapping name
-	 */
-	public String getFeatureTypeName() {
-		return currentFeatureTypeMappingName;
-	}
-
-	/**
-	 * Return all property paths for which no association target could be found
-	 * in the schema.
-	 * 
-	 * @return list of properties with missing association targets
-	 */
-	public Set<String> getMissingAssociationTargets() {
-		return this.missingAssociationTargets;
-	}
-
-	void addMissingAssociationTarget(final String associationTarget) {
-		this.missingAssociationTargets.add(associationTarget);
-	}
-
-	Value getTransformationProperty(final String name) {
-		final Value val = this.transformationProperties.get(name);
-		if (val != null) {
-			return val;
-		}
-		return Value.NULL;
-	}
-
-	/**
-	 * Retrieve table from current FeatureTypeMapping
-	 * 
-	 * @param tableName Mapping Table name
-	 * @return MappingTable
-	 */
-	Optional<MappingTableBuilder> getTable(String tableName) {
-		return Optional.ofNullable(currentMappingTables.get(tableName));
-	}
-
-	void addValueMappingToTable(final Property target, final MappingValue value,
-			final String tableName) {
-
-		final MappingTableBuilder tableBuilder = getTable(tableName).orElseThrow(
-				() -> new IllegalArgumentException("Table " + tableName + " not found"));
-		final MappingTableDraft tableDraft = tableBuilder.buildDraft();
-
-		// if joinPaths and no target path and multiple, set target path ->
-		// joined table
-		// if joinPaths and target path and not multiple, clear target path ->
-		// merged table
-		// ignore merged tables in JaxbWriter, transform to virtual tables in
-		// transformer
-		if (!tableDraft.getJoinPaths().isEmpty()
-				&& target.getDefinition().getPropertyPath() != null) {
-			// Target is set in value mapping, check if the property is multiple
-			// and the
-			// target must be added to the table
-
-			boolean alreadyHasTargetPath = !tableDraft.getQualifiedTargetPath().isEmpty();
-			List<QName> targetPath = new ArrayList<>();
-			boolean multiple = false;
-			for (final Iterator<ChildContext> it = target.getDefinition().getPropertyPath()
-					.iterator(); it.hasNext();) {
-				final ChildContext segment = it.next();
-				final PropertyDefinition property = segment.getChild().asProperty();
-				targetPath.add(segment.getChild().getName());
-				if (property != null) {
-					final Cardinality cardinality = property.getConstraint(Cardinality.class);
-					if (cardinality.mayOccurMultipleTimes()) {
-
-						if (!alreadyHasTargetPath && tableDraft.getValues().isEmpty()) {
-							tableBuilder.qualifiedTargetPath(targetPath);
-						}
-						if (alreadyHasTargetPath
-								&& !targetPath.equals(tableDraft.getQualifiedTargetPath())) {
-							tableBuilder
-									.qualifiedTargetPath(ImmutableList.of(new QName("__MERGE__")));
-						}
-						multiple = true;
-						break;
-					}
-				}
-			}
-			if (!multiple && alreadyHasTargetPath) {
-				tableBuilder.qualifiedTargetPath(ImmutableList.of(new QName("__MERGE__")));
-			}
-			// set target path for connection table
-			if (multiple && !targetPath.isEmpty()) {
-				String connectionTable = tableDraft.getJoinPaths().iterator().next()
-						.getSourceTable();
-				final Optional<MappingTableBuilder> tableBuilder2 = getTable(connectionTable);
-				if (tableBuilder2.isPresent()) {
-					final MappingTableDraft tableDraft2 = tableBuilder2.get().buildDraft();
-					if (tableDraft2.getQualifiedTargetPath().isEmpty()
-							&& tableDraft2.getValues().isEmpty()
-							&& !tableDraft2.getJoinPaths().isEmpty()) {
-						tableBuilder2.get().qualifiedTargetPath(targetPath);
-					}
-				}
-			}
-		}
-
-		tableBuilder.value(value);
-	}
-
-	IOReporter getReporter() {
-		return reporter;
-	}
-
-	/**
-	 * Return the property cells for a type cell
-	 * 
-	 * @param typeCell the type cell
-	 * @return the property cells associated with type cell
-	 */
-	Collection<? extends Cell> getPropertyCells(final Cell typeCell) {
-		return this.alignment.getPropertyCells(typeCell);
-	}
-
-	/**
-	 * Return the XtraServerMapping containing all FeatureTypeMappings that were
-	 * propagated
-	 * 
-	 * @return XtraServerMapping containing all FeatureTypeMappings
-	 */
-	public XtraServerMapping getMapping() {
-		buildAndClearCurrentTables();
-
-		final XtraServerMappingBuilder xtraServerMappingBuilder = new XtraServerMappingBuilder();
-
-		xtraServerMappingBuilder.description("\n  Source:\n    - hale "
-				+ projectInfo.getHaleVersion().toString() + "\n    - "
-				+ (projectLocation != null ? projectLocation.toString() : projectInfo.getName())
-				+ "\n");
-
-		featureTypeMappings.values().stream().map(FeatureTypeMappingBuilder::build)
-				.forEach(xtraServerMappingBuilder::featureTypeMapping);
-
-		XtraServerMapping fannedOutmapping = XtraServerMappingTransformer
-				.forMapping(xtraServerMappingBuilder.build())
-				.applySchemaInfo(this.applicationSchemaUri).fanOutInheritance()
-				.ensureRelationNavigability().fixMultiplicity().virtualTables().transform();
-
-		return fannedOutmapping;
-	}
-
-	/**
-	 * Replace project variables in a string
-	 * 
-	 * @param str input string
-	 * @return string with replaced project variables, unresolved variables are
-	 *         replaced with 'PROJECT_VARIABLE_<VARIABLE_NAME>_NOT_SET'
-	 */
-	public String resolveProjectVars(final String str) {
-		final Matcher m = projectVarPattern.matcher(str);
-		String repStr = str;
-		while (m.find()) {
-			final String varName = m.group(1);
-			final Value val = transformationProperties.get(varName);
-			final String replacement;
-			if (val != null && !val.isEmpty()) {
-				replacement = val.as(String.class);
-			}
-			else {
-				replacement = "PROJECT_VARIABLE_" + varName + "_NOT_SET";
-			}
-			repStr = repStr.replaceAll("\\{\\{project:" + varName + "\\}\\}",
-					Matcher.quoteReplacement(replacement));
-		}
-		return repStr;
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MathematicalExpressionHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MathematicalExpressionHandler.java
deleted file mode 100644
index e4dab005e6..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/MathematicalExpressionHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.cst.functions.numeric.MathematicalExpressionFunction;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-
-/**
- * Transforms the {@link MathematicalExpressionFunction} to a
- * {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class MathematicalExpressionHandler extends AbstractPropertyTransformationHandler {
-
-	MathematicalExpressionHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		// Get mathematical expression from parameters
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-		final List<ParameterValue> expressions = parameters.get("expression");
-		if (expressions.isEmpty()) {
-			throw new IllegalArgumentException("Expression not set");
-		}
-		else if (expressions.size() > 1) {
-			throw new IllegalArgumentException("Only one expression is supported");
-		}
-		String expression = expressions.get(0).getStringRepresentation();
-		// Replace variables in the expression with our expression syntax
-		final Collection<? extends Entity> variables = propertyCell.getSource().asMap().get("var");
-		for (Entity var : variables) {
-			final String varName = var.getDefinition().getDefinition().getName().getLocalPart();
-			expression = expression.replaceAll(varName, "\\$T\\$." + varName);
-		}
-
-		final MappingValue mappingValue = new MappingValueBuilder().expression()
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value(expression).build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandler.java
deleted file mode 100644
index e9805df691..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-
-/**
- * Handler for Property transformations
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-@FunctionalInterface
-public interface PropertyTransformationHandler extends TransformationHandler<MappingValue> {
-
-	/**
-	 * Create a new {@link PropertyTransformationHandlerFactory} object
-	 * 
-	 * @param mappingContext Mapping Context
-	 * @return new Property Transformation Handler Factory object
-	 */
-	public static PropertyTransformationHandlerFactory createFactory(
-			final MappingContext mappingContext) {
-		return new PropertyTransformationHandlerFactory(mappingContext);
-	}
-
-	/**
-	 * Check if a transformation is supported by the
-	 * {@link PropertyTransformationHandlerFactory}
-	 * 
-	 * @param typeTransformationIdentifier the hale identifier of the transformation
-	 * @return true if the transformation is supported, false otherwise
-	 */
-	public static boolean isTransformationSupported(final String typeTransformationIdentifier) {
-		return PropertyTransformationHandlerFactory.SUPPORTED_TYPES
-				.contains(typeTransformationIdentifier);
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandlerFactory.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandlerFactory.java
deleted file mode 100644
index 28e3b06e4d..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/PropertyTransformationHandlerFactory.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import eu.esdihumboldt.cst.functions.numeric.MathematicalExpressionFunction;
-import eu.esdihumboldt.cst.functions.string.RegexAnalysisFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.AssignFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.ClassificationMappingFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.FormattedStringFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.RenameFunction;
-
-/**
- * Factory for creating Property Transformation Handlers
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class PropertyTransformationHandlerFactory
-		extends AbstractTransformationHandlerFactory<PropertyTransformationHandler> {
-
-	private final static String SQL_EXPRESSION_ID = "eu.esdihumboldt.hale.io.xtraserver.sqlExpression";
-
-	private final static String[] supportedTypes = { RenameFunction.ID,
-			MathematicalExpressionFunction.ID, AssignFunction.ID, AssignFunction.ID_BOUND,
-			FormattedStringFunction.ID, RegexAnalysisFunction.ID, ClassificationMappingFunction.ID,
-			CustomFunctionAdvToGeographicalNameSimple.FUNCTION_ID,
-			CustomFunctionAdvToIdentifier.FUNCTION_ID, CustomFunctionAdvToLocalId.FUNCTION_ID,
-			CustomFunctionAdvToNamespace.FUNCTION_ID, CustomFunctionAdvToUCUM.FUNCTION_ID,
-			SQL_EXPRESSION_ID };
-	final static Set<String> SUPPORTED_TYPES = Collections
-			.unmodifiableSet(new HashSet<String>(Arrays.asList(supportedTypes)));
-
-	@SuppressWarnings("serial")
-	PropertyTransformationHandlerFactory(final MappingContext mappingContext) {
-		super(mappingContext, new HashMap<String, PropertyTransformationHandler>() {
-
-			{
-				int i = 0;
-				put(supportedTypes[i++], new RenameHandler(mappingContext));
-				put(supportedTypes[i++], new MathematicalExpressionHandler(mappingContext));
-				put(supportedTypes[i++], new AssignHandler(mappingContext));
-				put(supportedTypes[i++], new AssignHandler(mappingContext));
-				put(supportedTypes[i++], new FormattedStringHandler(mappingContext));
-				put(supportedTypes[i++], new RegexHandler(mappingContext));
-				put(supportedTypes[i++], new ClassificationMappingHandler(mappingContext));
-				put(supportedTypes[i++],
-						new CustomFunctionAdvToGeographicalNameSimple(mappingContext));
-				put(supportedTypes[i++], new CustomFunctionAdvToIdentifier(mappingContext));
-				put(supportedTypes[i++], new CustomFunctionAdvToLocalId(mappingContext));
-				put(supportedTypes[i++], new CustomFunctionAdvToNamespace(mappingContext));
-				put(supportedTypes[i++], new CustomFunctionAdvToUCUM(mappingContext));
-				put(supportedTypes[i++], new SqlExpressionHandler(mappingContext));
-			}
-		});
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RegexHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RegexHandler.java
deleted file mode 100644
index 66cb90516b..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RegexHandler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.cst.functions.string.RegexAnalysisFunction;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ChildContext;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the {@link RegexAnalysisFunction} to a {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class RegexHandler extends AbstractPropertyTransformationHandler {
-
-	RegexHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.AbstractPropertyTransformationHandler#doHandle(eu.esdihumboldt.hale.common.align.model.Cell,
-	 *      eu.esdihumboldt.hale.common.align.model.Property)
-	 */
-	@Override
-	protected Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-		final List<ParameterValue> regexParam = parameters.get("regexPattern");
-		if (regexParam.isEmpty()) {
-			throw new IllegalArgumentException("Regular expression not set");
-		}
-		final String regex = regexParam.get(0).as(String.class);
-
-		final List<ParameterValue> outputFormatParam = parameters.get("outputFormat");
-		if (outputFormatParam.isEmpty()) {
-			throw new IllegalArgumentException("Output format for regular expression not set");
-		}
-		final String outputFormat = outputFormatParam.get(0).as(String.class);
-
-		final Iterator<ChildContext> it = XtraServerMappingUtils.getSourceProperty(propertyCell)
-				.getDefinition().getPropertyPath().iterator();
-		ChildContext lastItem = null;
-		while (it.hasNext()) {
-			lastItem = it.next();
-		}
-		if (lastItem == null) {
-			throw new IllegalArgumentException("Invalid target for regular expression");
-		}
-
-		final String regexpTargetProperty = lastItem.getChild().getName().getLocalPart();
-		// Replace {number} with escaped-escaped-escaped \\number
-		final MappingValue mappingValue = new MappingValueBuilder()
-				.expression()
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value("regexp_replace($T$." + regexpTargetProperty + ", '" + regex + "', '"
-						+ outputFormat.replaceAll("\\{(\\d)\\}", "\\\\$1") + "', 'g')").build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RenameHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RenameHandler.java
deleted file mode 100644
index 98e6c5f8f9..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RenameHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Optional;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.functions.RenameFunction;
-import eu.esdihumboldt.hale.io.xtraserver.writer.XtraServerMappingUtils;
-
-/**
- * Transforms the {@link RenameFunction} to a {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class RenameHandler extends AbstractPropertyTransformationHandler {
-
-	RenameHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-		final MappingValue mappingValue = new MappingValueBuilder()
-				.column()
-				.qualifiedTargetPath(buildPath(targetProperty.getDefinition().getPropertyPath()))
-				.value(propertyName(XtraServerMappingUtils.getSourceProperty(propertyCell)
-						.getDefinition().getPropertyPath())).build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RetypeHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RetypeHandler.java
deleted file mode 100644
index 0fd631e13b..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/RetypeHandler.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Collection;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.Entity;
-import eu.esdihumboldt.hale.common.align.model.functions.RetypeFunction;
-
-/**
- * Transforms the {@link RetypeFunction} to a {@link FeatureTypeMapping}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class RetypeHandler extends AbstractTypeTransformationHandler {
-
-	RetypeHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TypeTransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public void doHandle(final Collection<? extends Entity> sourceTypes, final Entity targetType,
-			final Cell typeCell) {
-		createTableIfAbsent(sourceTypes.iterator().next().getDefinition());
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/SqlExpressionHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/SqlExpressionHandler.java
deleted file mode 100644
index ce691ed5a4..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/SqlExpressionHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.List;
-import java.util.Optional;
-
-import javax.xml.namespace.QName;
-
-import com.google.common.collect.ListMultimap;
-
-import de.interactive_instruments.xtraserver.config.api.MappingValue;
-import de.interactive_instruments.xtraserver.config.api.MappingValueBuilder;
-import eu.esdihumboldt.hale.common.align.model.Cell;
-import eu.esdihumboldt.hale.common.align.model.ParameterValue;
-import eu.esdihumboldt.hale.common.align.model.Property;
-import eu.esdihumboldt.hale.common.align.model.functions.RenameFunction;
-
-/**
- * Transforms the {@link RenameFunction} to a {@link MappingValue}
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-class SqlExpressionHandler extends AbstractPropertyTransformationHandler {
-
-	final static String PARAMETER_VALUE = "sql";
-
-	SqlExpressionHandler(final MappingContext mappingContext) {
-		super(mappingContext);
-	}
-
-	/**
-	 * @see eu.esdihumboldt.hale.io.xtraserver.writer.handler.TransformationHandler#handle(eu.esdihumboldt.hale.common.align.model.Cell)
-	 */
-	@Override
-	public Optional<MappingValue> doHandle(final Cell propertyCell, final Property targetProperty) {
-
-		// Assign expression value from parameters
-		final ListMultimap<String, ParameterValue> parameters = propertyCell
-				.getTransformationParameters();
-		final List<ParameterValue> valueParams = parameters.get(PARAMETER_VALUE);
-		final String value = valueParams.get(0).getStringRepresentation();
-
-		final List<QName> path = buildPath(targetProperty.getDefinition().getPropertyPath());
-
-		final MappingValue mappingValue = new MappingValueBuilder().expression()
-				.qualifiedTargetPath(path).value(mappingContext.resolveProjectVars(value)).build();
-
-		return Optional.of(mappingValue);
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TransformationHandler.java
deleted file mode 100644
index 4a532a08bd..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TransformationHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import eu.esdihumboldt.hale.common.align.model.Cell;
-
-/**
- * Transformation Handler
- * 
- * @param <T> output type to transform to
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-@FunctionalInterface
-public interface TransformationHandler<T> {
-
-	/**
-	 * Transforms a alignment cell into an output type
-	 * 
-	 * @param cell the alignment cell
-	 * @return output type to transform to
-	 */
-	T handle(final Cell cell);
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandler.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandler.java
deleted file mode 100644
index a90387b67b..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandler.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import de.interactive_instruments.xtraserver.config.api.FeatureTypeMapping;
-
-/**
- * Handler for Type transformations
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-@FunctionalInterface
-public interface TypeTransformationHandler extends TransformationHandler<FeatureTypeMapping> {
-
-	/**
-	 * Create a new {@link TypeTransformationHandlerFactory} object
-	 * 
-	 * @param mappingContext Mapping Context
-	 * @return new Type Transformation Handler Factory object
-	 */
-	public static TypeTransformationHandlerFactory createFactory(
-			final MappingContext mappingContext) {
-		return new TypeTransformationHandlerFactory(mappingContext);
-	}
-
-	/**
-	 * Check if a transformation is supported by the
-	 * {@link TypeTransformationHandlerFactory}
-	 * 
-	 * @param typeTransformationIdentifier the hale identifier of the transformation
-	 * @return true if the transformation is supported, false otherwise
-	 */
-	public static boolean isTransformationSupported(final String typeTransformationIdentifier) {
-		return TypeTransformationHandlerFactory.SUPPORTED_TYPES
-				.contains(typeTransformationIdentifier);
-	}
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandlerFactory.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandlerFactory.java
deleted file mode 100644
index 41445ec6c3..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/TypeTransformationHandlerFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-import eu.esdihumboldt.hale.common.align.model.functions.JoinFunction;
-import eu.esdihumboldt.hale.common.align.model.functions.RetypeFunction;
-
-/**
- * Factory for creating Type Transformation Handlers
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-public class TypeTransformationHandlerFactory
-		extends AbstractTransformationHandlerFactory<TypeTransformationHandler> {
-
-	private final static String[] supportedTypes = { RetypeFunction.ID, JoinFunction.ID };
-	final static Set<String> SUPPORTED_TYPES = Collections
-			.unmodifiableSet(new HashSet<String>(Arrays.asList(supportedTypes)));
-
-	@SuppressWarnings("serial")
-	TypeTransformationHandlerFactory(final MappingContext mappingContext) {
-		super(mappingContext, new HashMap<String, TypeTransformationHandler>() {
-
-			{
-				int i = 0;
-				put(supportedTypes[i++], new RetypeHandler(mappingContext));
-				put(supportedTypes[i++], new JoinHandler(mappingContext));
-				// GroovyJoins are partially transformed with warnings
-				put("eu.esdihumboldt.cst.functions.groovy.join",
-						new GroovyJoinHandler(mappingContext));
-			}
-		});
-	}
-
-}
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/UnsupportedTransformationException.java b/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/UnsupportedTransformationException.java
deleted file mode 100644
index 9837996410..0000000000
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/src/eu/esdihumboldt/hale/io/xtraserver/writer/handler/UnsupportedTransformationException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2017 interactive instruments GmbH
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation, either version 3 of the License,
- * or (at your option) any later version.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
- * Contributors:
- *     interactive instruments GmbH <http://www.interactive-instruments.de>
- */
-
-package eu.esdihumboldt.hale.io.xtraserver.writer.handler;
-
-/**
- * Exception to indicate that a type or a property transformation is not
- * supported
- * 
- * @author Jon Herrmann ( herrmann aT interactive-instruments doT de )
- */
-@SuppressWarnings("serial")
-public class UnsupportedTransformationException extends Exception {
-
-	private final String transformationIdentifier;
-
-	/**
-	 * Constructor
-	 * 
-	 * @param transformationIdentifier the hale type or property transformation
-	 *            identifier
-	 */
-	public UnsupportedTransformationException(final String transformationIdentifier) {
-		super("The transformation is not supported: " + transformationIdentifier);
-		this.transformationIdentifier = transformationIdentifier;
-	}
-
-	/**
-	 * Returns the unsupported transformation
-	 * 
-	 * @return the transformation identifier
-	 */
-	public String getTransformationIdentifier() {
-		return transformationIdentifier;
-	}
-
-}
diff --git a/platform/hale-platform.target b/platform/hale-platform.target
index 97c80cb54e..588da287d0 100644
--- a/platform/hale-platform.target
+++ b/platform/hale-platform.target
@@ -47,9 +47,9 @@
 <repository location="http://build-artifacts.wetransform.to/p2/mirror/gef-legacy-releases/"/>
 <unit id="org.eclipse.gef.all.feature.group" version="3.11.0.201606061308"/>
 </location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<repository location="http://build-artifacts.wetransform.to/hale-build-support-96b81f6/updatesites/platform"/>
-<unit id="eu.esdihumboldt.hale.platform.feature.group" version="4.0.0.i20200630"/>
-</location>
+	<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+		<repository location="https://gitlab.wetransform.to/hale/hale-build-support/raw/f1509de425018449974ed59c4480489bd82df45f/updatesites/platform"/>
+		<unit id="eu.esdihumboldt.hale.platform.feature.group" version="4.1.0.i20210309"/>
+	</location>
 </locations>
 </target>
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.dropins/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.dropins/feature.xml
index ef8f33c2d6..4df7513beb 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.dropins/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.dropins/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.dropins"
       label="Application Dropins Support"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.linux/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.linux/feature.xml
index bb5a1ac81d..7dfa720ba1 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.linux/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.linux/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.linux"
       label="Linux specific HALE feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       os="linux">
 
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.liveeditor/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.liveeditor/feature.xml
index 7e164d0b19..c696a97799 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.liveeditor/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.liveeditor/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.liveeditor"
       label="E4 Live Editor"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.macosx/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.macosx/feature.xml
index 878c8ef71c..94636e62f6 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.macosx/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.macosx/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.macosx"
       label="Mac OS X specific HALE feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       os="macosx">
 
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.rcp/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.rcp/feature.xml
index dba7db1967..f723a24091 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.rcp/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.rcp/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.rcp"
       label="RCP base feature"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.updates/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.updates/feature.xml
index 35acb95083..04a8a65396 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.updates/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.updates/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.updates"
       label="Software Updates Feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel">
 
    <license>
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.win32/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.win32/feature.xml
index 30fd9627d5..ec8bffdf3c 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.win32/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.win32/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.win32"
       label="Windows specific HALE feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       os="win32">
 
    <license>
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature.zest/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature.zest/feature.xml
index a78354d31d..2646be3d0e 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature.zest/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature.zest/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature.zest"
       label="Eclipse Zest and dependencies"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
diff --git a/ui/features/eu.esdihumboldt.hale.ui.feature/feature.xml b/ui/features/eu.esdihumboldt.hale.ui.feature/feature.xml
index 9b367a698c..8c4156b534 100644
--- a/ui/features/eu.esdihumboldt.hale.ui.feature/feature.xml
+++ b/ui/features/eu.esdihumboldt.hale.ui.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.hale.ui.feature"
       label="HALE application feature"
-      version="4.0.0.qualifier"
+      version="4.1.0.qualifier"
       provider-name="data harmonisation panel"
       plugin="eu.esdihumboldt.hale.ui.application">
 
@@ -511,11 +511,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="eu.esdihumboldt.hale.doc.xtraserver"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application.help.external/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.application.help.external/META-INF/MANIFEST.MF
index 950bd4ffbc..b7c1ce4eb0 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application.help.external/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application.help.external/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: External Browser for Help
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.application.help.external
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Fragment-Host: eu.esdihumboldt.hale.ui.application;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application.help.internal/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.application.help.internal/META-INF/MANIFEST.MF
index ceb643a71a..4ac2db8dee 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application.help.internal/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application.help.internal/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Internal Browser for Help
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.application.help.internal
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Fragment-Host: eu.esdihumboldt.hale.ui.application;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product b/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
index fdca14355c..c3de1d9005 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/HALE.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="hale studio" uid="eu.esdihumboldt.hale" id="eu.esdihumboldt.hale.ui.application.HALE" application="eu.esdihumboldt.hale.ui.application" version="4.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="hale studio" uid="eu.esdihumboldt.hale" id="eu.esdihumboldt.hale.ui.application.HALE" application="eu.esdihumboldt.hale.ui.application" version="4.1.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.esdihumboldt.hale.ui.application/images/hale_about.png"/>
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF
index 43093471ab..cc78bde64d 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Application
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.application;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.6.2",
@@ -40,6 +40,7 @@ Import-Package: com.google.common.collect;version="15.0.0",
  eu.esdihumboldt.hale.ui.views.tasks,
  eu.esdihumboldt.hale.ui.views.typehierarchy,
  org.apache.commons.io,
+ org.apache.commons.lang3;version="3.8.1",
  org.eclipse.e4.ui.css.swt.theme,
  org.geotools.referencing,
  org.slf4j;version="1.5.11",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/plugin.xml b/ui/plugins/eu.esdihumboldt.hale.ui.application/plugin.xml
index fd85afc477..5c7dbece1e 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application/plugin.xml
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/plugin.xml
@@ -100,7 +100,7 @@
          </property>
          <property
                name="splashCopyrightNotice"
-               value="© 2020 wetransform GmbH » www.wetransform.to">
+               value="© 2021 wetransform GmbH » www.wetransform.to">
          </property>
          <property
                name="build"
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.application/src/eu/esdihumboldt/hale/ui/application/Application.java b/ui/plugins/eu.esdihumboldt.hale.ui.application/src/eu/esdihumboldt/hale/ui/application/Application.java
index 26759d8780..c4d0d7af7c 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.application/src/eu/esdihumboldt/hale/ui/application/Application.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.application/src/eu/esdihumboldt/hale/ui/application/Application.java
@@ -15,6 +15,7 @@
  */
 package eu.esdihumboldt.hale.ui.application;
 
+import org.apache.commons.lang3.SystemUtils;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
@@ -51,13 +52,17 @@ protected Object run(ApplicationContext executionContext, IApplicationContext ap
 		// install SLF4J JUL bridge
 		SLF4JBridgeHandler.install();
 
-		WKTPreferencesCRSFactory.install();
-
-		// init HSQL database
-		try {
-			CRS.decode("EPSG:4326"); //$NON-NLS-1$
-		} catch (Exception e) {
-			_log.error("Error while initializing epsg database", e); //$NON-NLS-1$
+		// Skip installing WKTPreferencesCRSFactory and CRS if the app is run in
+		// mac OS.
+		// Change is done as part of Issue: 849.
+		if (!SystemUtils.IS_OS_MAC) {
+			WKTPreferencesCRSFactory.install();
+			// init HSQL database
+			try {
+				CRS.decode("EPSG:4326"); //$NON-NLS-1$
+			} catch (Exception e) {
+				_log.error("Error while initializing epsg database", e); //$NON-NLS-1$
+			}
 		}
 
 		// find base path of the application.
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.cache/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.cache/META-INF/MANIFEST.MF
index f08548fc58..2942d83944 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.cache/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.cache/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Cache UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.cache;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.hale.common.cache,
  eu.esdihumboldt.hale.common.core
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.codelist.inspire/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.codelist.inspire/META-INF/MANIFEST.MF
index 477bf035df..c07987f15e 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.codelist.inspire/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.codelist.inspire/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: INSPIRE Registry code lists source
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.codelist.inspire;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="15.0.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.codelist.test/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.codelist.test/META-INF/MANIFEST.MF
index afa16b7022..87ee6909fe 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.codelist.test/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.codelist.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Codelist UI Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.codelist.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Fragment-Host: eu.esdihumboldt.hale.ui.codelist;bundle-version="2.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.codelist/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.codelist/META-INF/MANIFEST.MF
index f467c1316c..ae94886108 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.codelist/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.codelist/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE CodeList UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.codelist;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="15.0.0",
  de.fhg.igd.osgi.util.configuration,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.codelist/src/eu/esdihumboldt/hale/ui/codelist/io/CodeListUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui.codelist/src/eu/esdihumboldt/hale/ui/codelist/io/CodeListUIAdvisor.java
index 7bc4916f1d..35ccf08219 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.codelist/src/eu/esdihumboldt/hale/ui/codelist/io/CodeListUIAdvisor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.codelist/src/eu/esdihumboldt/hale/ui/codelist/io/CodeListUIAdvisor.java
@@ -34,7 +34,7 @@ public Class<CodeList> getRepresentationType() {
 	}
 
 	@Override
-	public boolean supportsRemoval() {
+	public boolean supportsRemoval(String resourceId) {
 		return true;
 	}
 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.common.definition.editors/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.common.definition.editors/META-INF/MANIFEST.MF
index c173cbd439..e7b335ae1d 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.common.definition.editors/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.common.definition.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Attribute Editor Bundle
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.common.definition.editors;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
  de.fhg.igd.osgi.util,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.common.graph/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.common.graph/META-INF/MANIFEST.MF
index c1eee85b72..d92f5eb4e5 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.common.graph/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.common.graph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Common Graph UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.common.graph;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.ui.common.graph.content,
  eu.esdihumboldt.hale.ui.common.graph.figures,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF
index d5bd27c45f..a580969f75 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Common UI Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.common;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.cst.debug/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.cst.debug/META-INF/MANIFEST.MF
index d489883cc5..88f28c6f68 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.cst.debug/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.cst.debug/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST Debug UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.cst.debug;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.cst.debug.internal.CSTDebugBundle
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.cst/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.cst/META-INF/MANIFEST.MF
index d1f03ab048..1abbc07ce2 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.cst/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.cst/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CST UI Components
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.cst;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.cst;bundle-version="2.5.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.examples/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.examples/META-INF/MANIFEST.MF
index fa3e617487..5da5ef9bec 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.examples/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Examples UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.examples;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.ui;bundle-version="3.7.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF
index 28db0d00a1..3df6c0a6cf 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.filter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Filter UI Components
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.filter;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
  eu.esdihumboldt.hale.common.align.model,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.firststeps/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.firststeps/META-INF/MANIFEST.MF
index e5906023e6..498d716d2b 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.firststeps/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.firststeps/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Firststeps
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.firststeps;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui,
  org.eclipse.help.ui,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.core/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.core/META-INF/MANIFEST.MF
index 0958ee4c3f..14de306a4c 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.core/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI for CST core functions
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.core;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.custom/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.custom/META-INF/MANIFEST.MF
index ecb1d7c060..ea4a96af3f 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.custom/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.custom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Custom Functions UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.custom;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.106.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF
index f3fb44b09d..4cddd56a72 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.geometric/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI for CST geometric functions
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.geometric;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.groovy/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.groovy/META-INF/MANIFEST.MF
index cb46779a87..51cbf00adf 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.groovy/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI for CST Groovy functions
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  com.google.guava,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.inspire/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.inspire/META-INF/MANIFEST.MF
index 9f3be15290..e88b35561a 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.inspire/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.inspire/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Inspire
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.inspire;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  com.google.guava;bundle-version="9.0.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.functions.numeric/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.functions.numeric/META-INF/MANIFEST.MF
index 69ba9c95e9..aaa8fbe6f7 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.functions.numeric/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.functions.numeric/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI for CST numeric functions
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.functions.numeric;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.align,
  eu.esdihumboldt.hale.ui,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.geometry/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.geometry/META-INF/MANIFEST.MF
index 0d64281cea..84c2c76d80 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.geometry/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.geometry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE UI Geometry Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.geometry;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.geometry.internal.GeometryUIBundle
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.index/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.index/META-INF/MANIFEST.MF
index 5830360d6b..7200fde027 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.index/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.index/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Instance index
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.index;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="17.0.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.instancevalidation/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.instancevalidation/META-INF/MANIFEST.MF
index a5e40dd055..b18d9009df 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.instancevalidation/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.instancevalidation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Statusbar component showing instance validation results
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.instancevalidation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.launchaction/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.launchaction/META-INF/MANIFEST.MF
index 44c662f20e..886c29925f 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.launchaction/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.launchaction/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE UI Launch Action Extension Point
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.launchaction;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.logback.config/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.logback.config/META-INF/MANIFEST.MF
index a4799d94f1..ec00dc2bd8 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.logback.config/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.logback.config/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Logback Configuration
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.logback.config
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: ch.qos.logback.classic;bundle-version="0.9.19.v20100519-1505"
 Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.2
 Automatic-Module-Name: eu.esdihumboldt.hale.ui.logback.config
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.lookup/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.lookup/META-INF/MANIFEST.MF
index 1011fbb2e5..ad57bf307c 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.lookup/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.lookup/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Lookup Table UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.lookup;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.common.lookup;bundle-version="2.5.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.lookup/src/eu/esdihumboldt/hale/ui/lookup/LookupTableUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui.lookup/src/eu/esdihumboldt/hale/ui/lookup/LookupTableUIAdvisor.java
index ab925e9573..7470256ba3 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.lookup/src/eu/esdihumboldt/hale/ui/lookup/LookupTableUIAdvisor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.lookup/src/eu/esdihumboldt/hale/ui/lookup/LookupTableUIAdvisor.java
@@ -33,7 +33,7 @@ public Class<LookupTableInfo> getRepresentationType() {
 	}
 
 	@Override
-	public boolean supportsRemoval() {
+	public boolean supportsRemoval(String resourceId) {
 		return true;
 	}
 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.quickaccess/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.quickaccess/META-INF/MANIFEST.MF
index 204fa8278e..0a5f79e592 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.quickaccess/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.quickaccess/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Adds Quickaccess to toolbar
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.quickaccess;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: data harmonisation panel
 Require-Bundle: org.eclipse.e4.ui.workbench,
  org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.12.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.schema.presets/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.schema.presets/META-INF/MANIFEST.MF
index 2747d1f4f7..51a91e55aa 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.schema.presets/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.schema.presets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Prefedined Schema Source
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.schema.presets;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: eu.esdihumboldt.hale.ui;bundle-version="2.5.0",
  eu.esdihumboldt.hale.common.schema;bundle-version="2.5.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.scripting/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.scripting/META-INF/MANIFEST.MF
index 2452a7a224..fdab97ee75 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.scripting/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.scripting/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Scripting UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.scripting;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  eu.esdihumboldt.hale.common.scripting,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF
index 86a451450c..c5840109e6 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.style/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Style UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.style;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.ui.style,
  eu.esdihumboldt.hale.ui.style.dialog,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.style/src/eu/esdihumboldt/hale/ui/style/service/internal/StyleServiceImpl.java b/ui/plugins/eu.esdihumboldt.hale.ui.style/src/eu/esdihumboldt/hale/ui/style/service/internal/StyleServiceImpl.java
index de236c13cd..4a74728376 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.style/src/eu/esdihumboldt/hale/ui/style/service/internal/StyleServiceImpl.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.style/src/eu/esdihumboldt/hale/ui/style/service/internal/StyleServiceImpl.java
@@ -115,6 +115,11 @@ public void schemaAdded(SchemaSpaceID spaceID, Schema schema) {
 				update();
 			}
 
+			@Override
+			public void schemaRemoved(SchemaSpaceID spaceID) {
+				update();
+			}
+
 			@Override
 			public void schemasCleared(SchemaSpaceID spaceID) {
 				update();
@@ -465,11 +470,9 @@ private Collection<TypeDefinition> findTypes(Set<Name> featureTypeNames) {
 		Collection<TypeDefinition> result = new ArrayList<TypeDefinition>();
 
 		// search source...
-		result.addAll(
-				findTypes(schemaService.getSchemas(SchemaSpaceID.SOURCE), qnames, localnames));
+		result.addAll(findTypes(schemaService.getSchemas(SchemaSpaceID.SOURCE), qnames, localnames));
 		// and target types
-		result.addAll(
-				findTypes(schemaService.getSchemas(SchemaSpaceID.TARGET), qnames, localnames));
+		result.addAll(findTypes(schemaService.getSchemas(SchemaSpaceID.TARGET), qnames, localnames));
 
 		return result;
 	}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.templates/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.templates/META-INF/MANIFEST.MF
index 7cfde22070..c2b1cddbd2 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.templates/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.templates/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Templates
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.templates;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.io;version="11.0.1",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.ttreeexporter/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.ttreeexporter/META-INF/MANIFEST.MF
index 089f8b0359..ee1613049b 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.ttreeexporter/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.ttreeexporter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ttreeexporter
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.ttreeexporter;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: eu.esdihumboldt.cst.extension.hooks,
  eu.esdihumboldt.hale.common.align.model.transformation.tree,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util.graph/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.util.graph/META-INF/MANIFEST.MF
index 4a6038105d..6c9388fd29 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util.graph/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util.graph/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Graph UI Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.util.graph
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.zest.core;bundle-version="2.0.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy.test/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy.test/META-INF/MANIFEST.MF
index 940181ef40..9d02baea55 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy.test/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy UI Tests
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.util.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Fragment-Host: eu.esdihumboldt.hale.ui.util.groovy;bundle-version="2.8.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy/META-INF/MANIFEST.MF
index b7f909fd50..059e8b865e 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Simple Groovy Source Viewer Support
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.util.groovy;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.util.groovy.internal.GroovyUIPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.util/META-INF/MANIFEST.MF
index fc22f62200..69988f30b8 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util/META-INF/MANIFEST.MF
@@ -2,11 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: UI Utilities
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.util;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.util.internal.UIUtilitiesPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.jface.text;bundle-version="3.7.1"
+ org.eclipse.jface.text;bundle-version="3.7.1",
+ org.eclipse.core.net;bundle-version="1.3.800"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.ui.util,
@@ -31,8 +32,9 @@ Export-Package: eu.esdihumboldt.hale.ui.util,
  eu.esdihumboldt.hale.ui.util.wizard
 Import-Package: com.google.common.base;version="11.0.1",
  com.google.common.util.concurrent;version="15.0.0",
- de.fhg.igd.slf4jplus,
  de.fhg.igd.osgi.util;version="1.0.0",
+ de.fhg.igd.slf4jplus,
+ eu.esdihumboldt.hale.common.core,
  eu.esdihumboldt.util,
  eu.esdihumboldt.util.http,
  org.apache.http,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/ExtendedFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/ExtendedFileFieldEditor.java
index 9a0689dc50..edff8a83cf 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/ExtendedFileFieldEditor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/ExtendedFileFieldEditor.java
@@ -18,8 +18,10 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.jface.preference.FileFieldEditor;
@@ -34,10 +36,9 @@
 public class ExtendedFileFieldEditor extends FileFieldEditor {
 
 	private String[] extensions;
-
 	private String[] names;
-
-	private int style;
+	private final int style;
+	private static final String LINE_SEPARATOR = "line.separator";
 
 	/**
 	 * Create a file field editor
@@ -115,12 +116,22 @@ protected String changePressed() {
 		if (!f.exists()) {
 			f = null;
 		}
-		File d = getFile(f);
+		List<File> d = getFiles(f);
 		if (d == null) {
 			return null;
 		}
 
-		return d.getAbsolutePath();
+		StringBuffer absolutePaths = new StringBuffer();
+		if (d.size() == 1) {
+			absolutePaths.append(d.get(0).getAbsolutePath());
+		}
+		else {
+			d.forEach(file -> {
+				absolutePaths.append(file.getAbsolutePath());
+				absolutePaths.append(System.getProperty(LINE_SEPARATOR));
+			});
+		}
+		return absolutePaths.toString();
 	}
 
 	/**
@@ -152,6 +163,47 @@ protected File getFile(File startingDirectory) {
 		return null;
 	}
 
+	/**
+	 * Helper to open the file chooser dialog to select multiple files.
+	 * 
+	 * @param startingDirectory the directory to open the dialog on.
+	 * @return File List of file(s) the user selected or <code>Empty list</code>
+	 *         if they do not.
+	 */
+	protected List<File> getFiles(File startingDirectory) {
+
+		FileDialog dialog = new FileDialog(getShell(), style);
+		if (startingDirectory != null) {
+			dialog.setFileName(startingDirectory.getPath());
+		}
+		if (extensions != null) {
+			dialog.setFilterExtensions(extensions);
+		}
+		if (names != null) {
+			dialog.setFilterNames(names);
+		}
+
+		List<File> files = new ArrayList<>();
+		if (dialog.open() != null) {
+			String[] fileNames = dialog.getFileNames();
+			String filterPath = dialog.getFilterPath();
+
+			Arrays.asList(fileNames).forEach(filename -> {
+				File f = new File(filename);
+				if (f.isAbsolute()) {
+					files.add(new File(filename));
+				}
+				else if (filename != null) {
+					filename = filename.trim();
+					if (filename.length() > 0) {
+						files.add(new File(filterPath + File.separator + filename));
+					}
+				}
+			});
+		}
+		return files;
+	}
+
 	/**
 	 * Sets this file field editor's file extension filter.
 	 * 
@@ -181,6 +233,10 @@ public void setFilterNames(String[] names) {
 	 * @param types the content types
 	 */
 	public void setContentTypes(Set<IContentType> types) {
+
+		/**
+		 * when loading for instance then enable multi selection for csv too.
+		 */
 		List<String> filters = new ArrayList<String>();
 		List<String> extensions = new ArrayList<String>();
 		for (IContentType type : types) {
@@ -211,7 +267,7 @@ public void setContentTypes(Set<IContentType> types) {
 			}
 		}
 
-		if ((style & SWT.OPEN) != 0) {
+		if (((style & SWT.OPEN) != 0) || ((style & SWT.MULTI) != 0)) {
 			// insert filter for all supported files
 			if (extensions.size() > 1) {
 				StringBuffer supportedExtensions = new StringBuffer();
@@ -238,4 +294,19 @@ public void setContentTypes(Set<IContentType> types) {
 		setFilterNames(filters.toArray(new String[filters.size()]));
 	}
 
+	/**
+	 * Method to return list of filepaths from filepath string delimited by
+	 * <code>System.getProperty(LINE_SEPARATOR)</code>.
+	 * 
+	 * @return list of file paths after splitting.
+	 */
+	public List<String> getStringValues() {
+		String stringValue = getStringValue();
+		String[] split = stringValue.split(System.getProperty(LINE_SEPARATOR));
+
+		List<String> collect = Arrays.asList(split).stream().filter(s -> !s.isEmpty())
+				.collect(Collectors.toList());
+		return collect;
+	}
+
 }
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/OpenFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/OpenFileFieldEditor.java
index bbb0f68756..73ff5fded4 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/OpenFileFieldEditor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/io/OpenFileFieldEditor.java
@@ -51,6 +51,15 @@ public OpenFileFieldEditor(String name, String labelText, boolean enforceAbsolut
 		super(name, labelText, enforceAbsolute, validationStrategy, parent, OPEN_STYLE);
 	}
 
+	/**
+	 * @see ExtendedFileFieldEditor#ExtendedFileFieldEditor(String, String,
+	 *      boolean, int, Composite, int )
+	 */
+	public OpenFileFieldEditor(String name, String labelText, boolean enforceAbsolute,
+			int validationStrategy, Composite parent, int style) {
+		super(name, labelText, enforceAbsolute, validationStrategy, parent, style);
+	}
+
 	/**
 	 * @see FileFieldEditor#FileFieldEditor(String, String, Composite)
 	 */
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/ProxySettings.java b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/ProxySettings.java
index 53b3f82218..4906f09089 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/ProxySettings.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/ProxySettings.java
@@ -17,13 +17,20 @@
 package eu.esdihumboldt.hale.ui.util.proxy;
 
 import java.net.Authenticator;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
 
+import org.eclipse.core.net.proxy.IProxyData;
+import org.eclipse.core.net.proxy.IProxyService;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.equinox.security.storage.SecurePreferencesFactory;
 import org.eclipse.equinox.security.storage.StorageException;
 import org.eclipse.jface.preference.IPreferenceStore;
 
 import de.fhg.igd.slf4jplus.ALogger;
 import de.fhg.igd.slf4jplus.ALoggerFactory;
+import eu.esdihumboldt.hale.common.core.HalePlatform;
 import eu.esdihumboldt.hale.ui.util.internal.UIUtilitiesPlugin;
 import eu.esdihumboldt.hale.ui.util.proxy.preferences.PreferenceConstants;
 import eu.esdihumboldt.util.http.ProxyUtil;
@@ -37,6 +44,10 @@ public class ProxySettings {
 
 	private static ALogger log = ALoggerFactory.getLogger(ProxySettings.class);
 
+	private static final IProxyService PROXY_SERVICE = HalePlatform.getService(IProxyService.class);
+	private static final List<String> HTTP_PROXY_TYPES = Arrays.asList(IProxyData.HTTP_PROXY_TYPE,
+			IProxyData.HTTPS_PROXY_TYPE);
+
 	/**
 	 * Install the proxy settings for them to be initialized when a proxy is
 	 * used from {@link ProxyUtil}
@@ -51,7 +62,11 @@ public static void install() {
 
 				@Override
 				public void run() {
-					applyCurrentSettings();
+					try {
+						applyCurrentSettings();
+					} catch (CoreException e) {
+						log.error("Proxy settings could not be applied", e); //$NON-NLS-1$
+					}
 				}
 			});
 		}
@@ -59,8 +74,10 @@ public void run() {
 
 	/**
 	 * Apply the current proxy settings to the system
+	 *
+	 * @throws CoreException if the proxy settings cannot be applied
 	 */
-	public static void applyCurrentSettings() {
+	public static void applyCurrentSettings() throws CoreException {
 		// update proxy system properties
 		IPreferenceStore prefs = UIUtilitiesPlugin.getDefault().getPreferenceStore();
 		String host = prefs.getString(PreferenceConstants.CONNECTION_PROXY_HOST);
@@ -76,40 +93,27 @@ public static void applyCurrentSettings() {
 			nonProxyHosts = nonProxyHosts.replaceAll(";", "|"); //$NON-NLS-1$ //$NON-NLS-2$
 		}
 
+		List<IProxyData> proxyData = Arrays.asList(PROXY_SERVICE.getProxyData());
 		if (host == null || host.isEmpty()) {
-			System.clearProperty("http.proxyHost"); //$NON-NLS-1$
-			System.clearProperty("https.proxyHost"); //$NON-NLS-1$
-
-			System.clearProperty("http.proxyPort"); //$NON-NLS-1$
-			System.clearProperty("https.proxyPort"); //$NON-NLS-1$
-
-			System.clearProperty("http.nonProxyHosts"); //$NON-NLS-1$
-			// http.nonProxyHost is used also by https
-
-			System.clearProperty("http.proxyUser"); //$NON-NLS-1$
-			System.clearProperty("https.proxyUser"); //$NON-NLS-1$
-
-			System.clearProperty("http.proxyPassword"); //$NON-NLS-1$
-			System.clearProperty("https.proxyPassword"); //$NON-NLS-1$
+			disableProxy();
 		}
 		else {
-			System.setProperty("http.proxyHost", host); //$NON-NLS-1$
-			System.setProperty("https.proxyHost", host); //$NON-NLS-1$
+			forEachHttpProxyType(proxyData, p -> {
+				p.setHost(host);
+				p.setPort(port);
+			});
 
-			System.setProperty("http.proxyPort", String.valueOf(port)); //$NON-NLS-1$
-			System.setProperty("https.proxyPort", String.valueOf(port)); //$NON-NLS-1$
 			if (nonProxyHosts == null || nonProxyHosts.isEmpty()) {
-				System.clearProperty("http.nonProxyHosts"); //$NON-NLS-1$
+				PROXY_SERVICE.setNonProxiedHosts(new String[] {});
 			}
 			else {
-				System.setProperty("http.nonProxyHosts", nonProxyHosts); //$NON-NLS-1$
+				PROXY_SERVICE.setNonProxiedHosts(nonProxyHosts.split("\\|"));
 			}
 
 			// only check user/password if host is set
 			String proxyUser = prefs.getString(PreferenceConstants.CONNECTION_PROXY_USER);
 			if (proxyUser != null && !proxyUser.isEmpty()) {
-				System.setProperty("http.proxyUser", proxyUser); //$NON-NLS-1$
-				System.setProperty("https.proxyUser", proxyUser); //$NON-NLS-1$
+				forEachHttpProxyType(proxyData, p -> p.setUserid(proxyUser));
 
 				try {
 					String password = SecurePreferencesFactory.getDefault()
@@ -117,27 +121,41 @@ public static void applyCurrentSettings() {
 							.get(PreferenceConstants.CONNECTION_PROXY_PASSWORD, null);
 
 					if (password != null) {
-						System.setProperty("http.proxyPassword", password); //$NON-NLS-1$
-						System.setProperty("https.proxyPassword", password); //$NON-NLS-1$
+						forEachHttpProxyType(proxyData, p -> p.setPassword(password));
 
 						Authenticator.setDefault(new HttpAuth(proxyUser, password));
 					}
 					else {
-						System.clearProperty("http.proxyPassword"); //$NON-NLS-1$
-						System.clearProperty("https.proxyPassword"); //$NON-NLS-1$
+						forEachHttpProxyType(proxyData, p -> p.setPassword(""));
 					}
 				} catch (StorageException e) {
 					log.error("Error accessing secure preferences for proxy password"); //$NON-NLS-1$
 				}
 			}
 			else {
-				System.clearProperty("http.proxyUser"); //$NON-NLS-1$
-				System.clearProperty("https.proxyUser"); //$NON-NLS-1$
-
-				System.clearProperty("http.proxyPassword"); //$NON-NLS-1$
-				System.clearProperty("https.proxyPassword"); //$NON-NLS-1$
+				forEachHttpProxyType(proxyData, p -> {
+					p.setUserid("");
+					p.setPassword("");
+				});
 			}
+
+			applyProxyData(proxyData);
 		}
 	}
 
+	private static void forEachHttpProxyType(List<IProxyData> proxyData,
+			Consumer<? super IProxyData> action) {
+		proxyData.stream().filter(p -> HTTP_PROXY_TYPES.contains(p.getType())).forEach(action);
+	}
+
+	private static void applyProxyData(List<IProxyData> proxyData) throws CoreException {
+		PROXY_SERVICE.setProxyData((IProxyData[]) proxyData.toArray());
+		PROXY_SERVICE.setProxiesEnabled(true);
+		PROXY_SERVICE.setSystemProxiesEnabled(false);
+	}
+
+	private static void disableProxy() {
+		PROXY_SERVICE.setProxiesEnabled(false);
+		PROXY_SERVICE.setSystemProxiesEnabled(false);
+	}
 }
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/preferences/ProxyPreferencePage.java b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/preferences/ProxyPreferencePage.java
index e50bebacea..59c9672d06 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/preferences/ProxyPreferencePage.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.util/src/eu/esdihumboldt/hale/ui/util/proxy/preferences/ProxyPreferencePage.java
@@ -16,6 +16,7 @@
 
 package eu.esdihumboldt.hale.ui.util.proxy.preferences;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
@@ -27,6 +28,8 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 
+import de.fhg.igd.slf4jplus.ALogger;
+import de.fhg.igd.slf4jplus.ALoggerFactory;
 import eu.esdihumboldt.hale.ui.util.components.PasswordFieldEditor;
 import eu.esdihumboldt.hale.ui.util.internal.Messages;
 import eu.esdihumboldt.hale.ui.util.internal.UIUtilitiesPlugin;
@@ -37,10 +40,10 @@
  * 
  * @author Michel Kraemer
  */
-public class ProxyPreferencePage extends FieldEditorPreferencePage implements
-		IWorkbenchPreferencePage {
+public class ProxyPreferencePage extends FieldEditorPreferencePage
+		implements IWorkbenchPreferencePage {
 
-//	private static final ALogger _log = ALoggerFactory.getLogger(ProxyPreferencePage.class);
+	private static final ALogger log = ALoggerFactory.getLogger(ProxyPreferencePage.class);
 
 	/**
 	 * Default constructor
@@ -95,7 +98,12 @@ public boolean performOk() {
 			return false;
 		}
 
-		ProxySettings.applyCurrentSettings();
+		try {
+			ProxySettings.applyCurrentSettings();
+		} catch (CoreException e) {
+			log.userError("Proxy settings could not be applied", e);
+			return false;
+		}
 
 		return true;
 	}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF
index b5663aba58..f61d68cb08 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Data Views
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.data;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.6.2",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/src/eu/esdihumboldt/hale/ui/views/data/internal/filter/InstanceServiceSelector.java b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/src/eu/esdihumboldt/hale/ui/views/data/internal/filter/InstanceServiceSelector.java
index 39fa784c0b..e2de2ef74a 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.data/src/eu/esdihumboldt/hale/ui/views/data/internal/filter/InstanceServiceSelector.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.data/src/eu/esdihumboldt/hale/ui/views/data/internal/filter/InstanceServiceSelector.java
@@ -233,6 +233,18 @@ public void run() {
 					});
 				}
 
+				@Override
+				public void schemaRemoved(SchemaSpaceID spaceID) {
+					final Display display = PlatformUI.getWorkbench().getDisplay();
+					display.syncExec(new Runnable() {
+
+						@Override
+						public void run() {
+							updateTypesSelection();
+						}
+					});
+				}
+
 				@Override
 				public void schemasCleared(SchemaSpaceID spaceID) {
 					final Display display = PlatformUI.getWorkbench().getDisplay();
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.functions/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.functions/META-INF/MANIFEST.MF
index 05b79640be..a1b32b4ea5 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.functions/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.functions/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Functions View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.functions;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Activator: eu.esdihumboldt.hale.ui.views.functions.internal.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.mapping/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.mapping/META-INF/MANIFEST.MF
index 06bd17a7ee..478b2ef9d5 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.mapping/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.mapping/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Mapping View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.mapping;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui;bundle-version="3.6.2",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF
index ed5c4a8a45..75eb85dcb1 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.properties/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Properties View Contributions
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.properties;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.2",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.report/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.report/META-INF/MANIFEST.MF
index 63d39675cc..218d17c214 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.report/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.report/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Report View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.report;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="9.0.0",
  de.fhg.igd.eclipse.util.extension,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/META-INF/MANIFEST.MF
index 37cfb118ed..3b8982bfc0 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Project Resources View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.resources;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
@@ -16,9 +16,14 @@ Import-Package: com.google.common.collect;version="15.0.0",
  eu.esdihumboldt.hale.common.core.io.extension,
  eu.esdihumboldt.hale.common.core.io.project,
  eu.esdihumboldt.hale.common.core.io.project.model,
+ eu.esdihumboldt.hale.common.instance.model,
+ eu.esdihumboldt.hale.common.schema,
+ eu.esdihumboldt.hale.common.schema.model,
  eu.esdihumboldt.hale.ui.common,
  eu.esdihumboldt.hale.ui.io.action,
+ eu.esdihumboldt.hale.ui.service.instance,
  eu.esdihumboldt.hale.ui.service.project,
+ eu.esdihumboldt.hale.ui.service.schema,
  eu.esdihumboldt.hale.ui.util.viewer,
  eu.esdihumboldt.hale.ui.views.properties,
  org.eclipse.ui.views.properties.tabbed,
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/ResourcesView.java b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/ResourcesView.java
index 5929a851c1..1947f4d892 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/ResourcesView.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/ResourcesView.java
@@ -15,6 +15,7 @@
 
 package eu.esdihumboldt.hale.ui.views.resources;
 
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -25,8 +26,16 @@
 
 import eu.esdihumboldt.hale.common.core.io.project.ProjectInfo;
 import eu.esdihumboldt.hale.common.core.io.project.model.Resource;
+import eu.esdihumboldt.hale.common.instance.model.DataSet;
+import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
+import eu.esdihumboldt.hale.common.schema.model.Schema;
+import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
+import eu.esdihumboldt.hale.ui.service.instance.InstanceService;
+import eu.esdihumboldt.hale.ui.service.instance.InstanceServiceAdapter;
 import eu.esdihumboldt.hale.ui.service.project.ProjectService;
 import eu.esdihumboldt.hale.ui.service.project.ProjectServiceAdapter;
+import eu.esdihumboldt.hale.ui.service.schema.SchemaService;
+import eu.esdihumboldt.hale.ui.service.schema.SchemaServiceListener;
 import eu.esdihumboldt.hale.ui.util.viewer.ViewerMenu;
 import eu.esdihumboldt.hale.ui.views.properties.PropertiesViewPart;
 import eu.esdihumboldt.hale.ui.views.resources.internal.ProjectToken;
@@ -42,6 +51,8 @@ public class ResourcesView extends PropertiesViewPart {
 
 	private TreeViewer viewer;
 	private ProjectServiceAdapter projectServiceListener;
+	private SchemaServiceListener ssListener;
+	private InstanceServiceAdapter isa;
 
 	@Override
 	protected void createViewControl(Composite parent) {
@@ -75,6 +86,7 @@ public void projectInfoChanged(ProjectInfo info) {
 					@Override
 					public void run() {
 						viewer.update(ProjectToken.TOKEN, null);
+						updateInDisplayThread();
 					}
 				});
 			}
@@ -88,6 +100,82 @@ public void run() {
 
 		new ViewerMenu(getSite(), viewer);
 		getSite().setSelectionProvider(viewer);
+
+		// adding listener to refresh the resource view when any schema,
+		// instance is added or cleared.
+		SchemaService ss = PlatformUI.getWorkbench().getService(SchemaService.class);
+		ssListener = new SchemaServiceListener() {
+
+			@Override
+			public void schemaRemoved(SchemaSpaceID spaceID) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						updateInDisplayThread();
+					}
+				});
+			}
+
+			@Override
+			public void schemasCleared(final SchemaSpaceID spaceID) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						updateInDisplayThread();
+					}
+				});
+			}
+
+			@Override
+			public void schemaAdded(final SchemaSpaceID spaceID, Schema schema) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						updateInDisplayThread();
+					}
+				});
+			}
+
+			@Override
+			public void mappableTypesChanged(final SchemaSpaceID spaceID,
+					Collection<? extends TypeDefinition> types) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						updateInDisplayThread();
+					}
+				});
+			}
+
+		};
+
+		ss.addSchemaServiceListener(ssListener);
+
+		InstanceService is = PlatformUI.getWorkbench().getService(InstanceService.class);
+		is.addListener(isa = new InstanceServiceAdapter() {
+
+			@Override
+			public void datasetChanged(DataSet type) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						updateInDisplayThread();
+					}
+				});
+			}
+
+		});
+
 	}
 
 	/**
@@ -100,6 +188,7 @@ protected void updateInDisplayThread() {
 			@Override
 			public void run() {
 				update();
+				refreshInDisplayThread();
 			}
 		});
 	}
@@ -120,6 +209,7 @@ protected void update() {
 	@Override
 	public void setFocus() {
 		viewer.getTree().setFocus();
+		refreshInDisplayThread();
 	}
 
 	@Override
@@ -128,8 +218,41 @@ public void dispose() {
 		if (projectServiceListener != null) {
 			ps.removeListener(projectServiceListener);
 		}
-
+		SchemaService ss = PlatformUI.getWorkbench().getService(SchemaService.class);
+		if (ssListener != null) {
+			ss.removeSchemaServiceListener(ssListener);
+		}
+		InstanceService is = PlatformUI.getWorkbench().getService(InstanceService.class);
+		if (isa != null) {
+			is.removeListener(isa);
+		}
 		super.dispose();
 	}
 
+	/**
+	 * Refresh tree viewer in the display thread
+	 */
+	protected void refreshInDisplayThread() {
+		if (Display.getCurrent() != null) {
+			refresh();
+		}
+		else {
+			final Display display = PlatformUI.getWorkbench().getDisplay();
+			display.syncExec(new Runnable() {
+
+				@Override
+				public void run() {
+					refresh();
+				}
+			});
+		}
+	}
+
+	/**
+	 * Refresh the tree viewer.
+	 */
+	public void refresh() {
+		viewer.refresh(true);
+	}
+
 }
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/internal/ResourcesLabelProvider.java b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/internal/ResourcesLabelProvider.java
index 8d9029cff1..7f8a750dd2 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/internal/ResourcesLabelProvider.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.resources/src/eu/esdihumboldt/hale/ui/views/resources/internal/ResourcesLabelProvider.java
@@ -52,18 +52,21 @@ public void update(ViewerCell cell) {
 		Object element = cell.getElement();
 		cell.setImage(getImage(element));
 
-		StyledString text = new StyledString(getText(element));
-
-		if (element instanceof Resource) {
-			Resource resource = (Resource) element;
-			if (resource.getContentType() != null) {
-				text.append(" (" + resource.getContentType().getName() + ")",
-						StyledString.DECORATIONS_STYLER);
+		String elementText = getText(element);
+		// avoid NPE when relative path check box selected.
+		if (elementText != null) {
+			StyledString text = new StyledString(elementText);
+			if (element instanceof Resource) {
+				Resource resource = (Resource) element;
+				if (resource.getContentType() != null) {
+					text.append(" (" + resource.getContentType().getName() + ")",
+							StyledString.DECORATIONS_STYLER);
+				}
 			}
-		}
 
-		cell.setText(text.getString());
-		cell.setStyleRanges(text.getStyleRanges());
+			cell.setText(text.getString());
+			cell.setStyleRanges(text.getStyleRanges());
+		}
 
 		super.update(cell);
 	}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF
index e52276bf98..d6cc089722 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Schema Views
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.schemas;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.hale.ui.views.schemas,
  eu.esdihumboldt.hale.ui.views.schemas.internal;x-internal:=true
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/SchemaExplorer.java b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/SchemaExplorer.java
index bbe0c5df79..7062dc6e84 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/SchemaExplorer.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/SchemaExplorer.java
@@ -224,6 +224,7 @@ public TreeViewer getTreeViewer() {
 	public void setSchema(TypeIndex schema) {
 		this.schema = schema;
 		tree.setInput(schema);
+		refreshInDisplayThread();
 	}
 
 	/**
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/ServiceSchemaExplorer.java b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/ServiceSchemaExplorer.java
index e0488541d5..30483a93ab 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/ServiceSchemaExplorer.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.schemas/src/eu/esdihumboldt/hale/ui/views/schemas/explorer/ServiceSchemaExplorer.java
@@ -17,6 +17,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.stream.StreamSupport;
 
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.PlatformUI;
@@ -25,6 +26,7 @@
 import eu.esdihumboldt.hale.common.align.model.EntityDefinition;
 import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
 import eu.esdihumboldt.hale.common.schema.model.Schema;
+import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
 import eu.esdihumboldt.hale.ui.common.service.population.PopulationListener;
 import eu.esdihumboldt.hale.ui.common.service.population.PopulationService;
@@ -78,6 +80,29 @@ public ServiceSchemaExplorer(final SchemaExplorer explorer, final SchemaSpaceID
 		schemaService = PlatformUI.getWorkbench().getService(SchemaService.class);
 		schemaService.addSchemaServiceListener(schemaListener = new SchemaServiceListener() {
 
+			@Override
+			public void schemaRemoved(SchemaSpaceID spaceID) {
+				final Display display = PlatformUI.getWorkbench().getDisplay();
+				display.syncExec(new Runnable() {
+
+					@Override
+					public void run() {
+						if (spaceID.equals(schemaSpace)) {
+							SchemaSpace schemas = schemaService.getSchemas(spaceID);
+							if (StreamSupport.stream(schemas.getSchemas().spliterator(), false)
+									.count() == 0) {
+								explorer.setSchema(null);
+							}
+							else {
+								explorer.setSchema(schemaService.getSchemas(spaceID));
+							}
+						}
+						refreshInDisplayThread();
+					}
+				});
+
+			}
+
 			@Override
 			public void schemasCleared(final SchemaSpaceID spaceID) {
 				final Display display = PlatformUI.getWorkbench().getDisplay();
@@ -87,6 +112,7 @@ public void schemasCleared(final SchemaSpaceID spaceID) {
 					public void run() {
 						if (spaceID.equals(schemaSpace)) {
 							explorer.setSchema(null);
+							refreshInDisplayThread();
 						}
 					}
 				});
@@ -102,6 +128,7 @@ public void run() {
 						if (spaceID.equals(schemaSpace)) {
 							explorer.setSchema(schemaService.getSchemas(spaceID));
 						}
+						refreshInDisplayThread();
 					}
 				});
 			}
@@ -117,6 +144,7 @@ public void run() {
 						if (spaceID.equals(schemaSpace)) {
 							explorer.setSchema(schemaService.getSchemas(spaceID));
 						}
+						refreshInDisplayThread();
 					}
 				});
 			}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.tasks/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.tasks/META-INF/MANIFEST.MF
index 10e4dbf0b2..bbca1ce3dd 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.tasks/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.tasks/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tasks View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.tasks;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
  eu.esdihumboldt.hale.ui.views.properties;bundle-version="3.3.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.transformation/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.transformation/META-INF/MANIFEST.MF
index d5712bbbd3..3fad841781 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.transformation/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.transformation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Transformation View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.transformation;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui.views.typehierarchy/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui.views.typehierarchy/META-INF/MANIFEST.MF
index 1ed412607a..25aaf7fee1 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui.views.typehierarchy/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui.views.typehierarchy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Type Hierarchy View
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui.views.typehierarchy; singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.forms;bundle-version="3.5.2"
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF b/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF
index 79c173f753..9ff43ba661 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: HALE Main UI
 Bundle-SymbolicName: eu.esdihumboldt.hale.ui;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.ui;bundle-version="3.5.1",
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/plugin.xml b/ui/plugins/eu.esdihumboldt.hale.ui/plugin.xml
index d13e2402cb..e504355111 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/plugin.xml
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/plugin.xml
@@ -689,6 +689,7 @@
             label="Source schema..."
             priority="-10"
             projectResource="true"
+            ui-advisor="eu.esdihumboldt.hale.ui.io.schema.SourceSchemaActionUIAdvisor"
             wizard="eu.esdihumboldt.hale.ui.io.schema.SchemaImportWizard">
       </action-ui>
       <action-ui
@@ -698,6 +699,7 @@
             label="Target schema..."
             priority="-9"
             projectResource="true"
+            ui-advisor="eu.esdihumboldt.hale.ui.io.schema.TargetSchemaActionUIAdvisor"
             wizard="eu.esdihumboldt.hale.ui.io.schema.SchemaImportWizard">
       </action-ui>
       <action-ui
@@ -904,6 +906,24 @@
             name="file"
             priority="-10">
       </source>
+      <source
+            class="eu.esdihumboldt.hale.ui.io.source.MultipleSchemaFilesSource"
+            description="Load a resource from a file applicable for schema reader"
+            icon="icons/file_obj.gif"
+            id="eu.esdihumboldt.hale.ui.io.source.multiplefiles"
+            name="multiple files"
+            priority="-6"
+            providerType="eu.esdihumboldt.hale.common.schema.io.SchemaReader">
+      </source>
+      <source
+            class="eu.esdihumboldt.hale.ui.io.source.MultipleInstanceFilesSource"
+            description="Load a resource from a file applicable for instance reader"
+            icon="icons/file_obj.gif"
+            id="eu.esdihumboldt.hale.ui.io.source.multiplefilesforinstance"
+            name="multiple files"
+            priority="-6"
+            providerType="eu.esdihumboldt.hale.common.instance.io.InstanceReader">
+      </source>
       <source
             class="eu.esdihumboldt.hale.ui.io.source.URLSource"
             description="Load a resource from the web"
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/IOWizard.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/IOWizard.java
index b8a9179942..60f5e02f5c 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/IOWizard.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/IOWizard.java
@@ -16,12 +16,17 @@
 
 package eu.esdihumboldt.hale.ui.io;
 
+import java.io.File;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -53,11 +58,15 @@
 import eu.esdihumboldt.hale.common.core.io.Value;
 import eu.esdihumboldt.hale.common.core.io.extension.IOProviderDescriptor;
 import eu.esdihumboldt.hale.common.core.io.extension.IOProviderExtension;
+import eu.esdihumboldt.hale.common.core.io.impl.GZipEnabledImport.GZipInputSupplier;
 import eu.esdihumboldt.hale.common.core.io.project.model.IOConfiguration;
 import eu.esdihumboldt.hale.common.core.io.project.model.Project;
 import eu.esdihumboldt.hale.common.core.io.report.IOReport;
 import eu.esdihumboldt.hale.common.core.io.report.IOReporter;
 import eu.esdihumboldt.hale.common.core.io.report.impl.IOMessageImpl;
+import eu.esdihumboldt.hale.common.core.io.supplier.FileIOSupplier;
+import eu.esdihumboldt.hale.common.core.io.supplier.FilesIOSupplier;
+import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
 import eu.esdihumboldt.hale.ui.io.action.ActionUI;
 import eu.esdihumboldt.hale.ui.io.action.ActionUIExtension;
 import eu.esdihumboldt.hale.ui.io.config.AbstractConfigurationPage;
@@ -68,9 +77,7 @@
 /**
  * Abstract I/O wizard based on {@link IOProvider} descriptors
  * 
- * @param
- * 			<P>
- *            the {@link IOProvider} type used in the wizard
+ * @param <P> the {@link IOProvider} type used in the wizard
  * 
  * @author Simon Templer
  * @partner 01 / Fraunhofer Institute for Computer Graphics Research
@@ -98,6 +105,8 @@ public abstract class IOWizard<P extends IOProvider> extends Wizard
 
 	private final List<IWizardPage> mainPages = new ArrayList<IWizardPage>();
 
+	private Queue<URI> uriLocations = null;
+
 	/**
 	 * Create an I/O wizard
 	 * 
@@ -518,132 +527,176 @@ public boolean performFinish() {
 			return false;
 		}
 
-		// create default report
-		IOReporter defReport = provider.createReporter();
+		if (initializeUsedLocations() == null && provider instanceof ImportProvider) {
+			// could not find any URIs in the provider.
+			return false;
+		}
 
-		// validate and execute provider
-		try {
-			// validate configuration
-			provider.validate();
-
-			ProjectService ps = PlatformUI.getWorkbench().getService(ProjectService.class);
-			URI projectLoc = ps.getLoadLocation() == null ? null : ps.getLoadLocation();
-			boolean isProjectResource = false;
-			if (actionId != null) {
-				// XXX instead move project resource to action?
-				ActionUI factory = ActionUIExtension.getInstance().findActionUI(actionId);
-				isProjectResource = factory.isProjectResource();
+		URI uriLoc = null;
+		// To avoid NPE in the case of export provider.
+		if (uriLocations != null) {
+			uriLoc = uriLocations.poll();
+		}
+		// either have to process all files or export provider
+		while (uriLoc != null || !(provider instanceof ImportProvider)) {
+
+			// If multiple files were selected then for every file
+			// initialize/reset FileIOSupplier in the provider. For the first
+			// loop it will be FilesIOSupplier (or FileIOSupplier when single
+			// file is selected) and from the second loop onwards
+			// FileIOSupplier
+			if (provider instanceof ImportProvider) {
+				ImportProvider importProvider = (ImportProvider) provider;
+				LocatableInputSupplier<? extends InputStream> source = importProvider.getSource();
+
+				// XXX Hack to support GZip-compressed sources
+				// If other classes were used here that wrap the original input
+				// supplier, the import will likely fail
+				if (source instanceof GZipInputSupplier) {
+					source = ((GZipInputSupplier) source).getSource();
+				}
+
+				if (source instanceof FilesIOSupplier || source instanceof FileIOSupplier) {
+					// always set FileIOSupplier to avoid huge impacts.
+					importProvider.setSource(new FileIOSupplier(new File(uriLoc)));
+				}
 			}
+			// else it is a non-file source or export provider and proceed with
+			// the code without updating the provider.
 
-			// prevent loading of duplicate resources
-			if (isProjectResource && provider instanceof ImportProvider
-					&& !getProviderFactory().allowDuplicateResource()) {
+			IOReporter defReport = provider.createReporter();
 
-				String currentResource = ((ImportProvider) provider).getSource().getLocation()
-						.toString();
-				URI currentAbsolute = URI.create(currentResource);
-				if (projectLoc != null && !currentAbsolute.isAbsolute()) {
-					currentAbsolute = projectLoc.resolve(currentAbsolute);
+			// validate and execute provider
+			try {
+				// validate configuration
+				provider.validate();
+
+				ProjectService ps = PlatformUI.getWorkbench().getService(ProjectService.class);
+				URI projectLoc = ps.getLoadLocation() == null ? null : ps.getLoadLocation();
+				boolean isProjectResource = false;
+				if (actionId != null) {
+					// XXX instead move project resource to action?
+					ActionUI factory = ActionUIExtension.getInstance().findActionUI(actionId);
+					isProjectResource = factory.isProjectResource();
 				}
 
-				for (IOConfiguration conf : ((Project) ps.getProjectInfo()).getResources()) {
-					Value otherResourceValue = conf.getProviderConfiguration()
-							.get(ImportProvider.PARAM_SOURCE);
-					if (otherResourceValue == null) {
-						continue;
-					}
+				// prevent loading of duplicate resources
+				if (isProjectResource && provider instanceof ImportProvider
+						&& !getProviderFactory().allowDuplicateResource()) {
+
+					String currentResource = ((ImportProvider) provider).getSource().getLocation()
+							.toString();
+					URI currentAbsolute = URI.create(currentResource);
 
-					String otherResource = otherResourceValue.as(String.class);
-					URI otherAbsolute = URI.create(otherResource);
-					if (projectLoc != null && !otherAbsolute.isAbsolute()) {
-						otherAbsolute = projectLoc.resolve(otherAbsolute);
+					if (projectLoc != null && !currentAbsolute.isAbsolute()) {
+						currentAbsolute = projectLoc.resolve(currentAbsolute);
 					}
-					String action = conf.getActionId();
-					// resource is already loaded into the project
-					if (currentAbsolute.equals(otherAbsolute) && Objects.equal(actionId, action)) {
-						// check if the resource is loaded with a provider that
-						// allows duplicates
-						boolean allowDuplicate = false;
-						IOProviderDescriptor providerFactory = IOProviderExtension.getInstance()
-								.getFactory(conf.getProviderId());
-						if (providerFactory != null) {
-							allowDuplicate = providerFactory.allowDuplicateResource();
+
+					for (IOConfiguration conf : ((Project) ps.getProjectInfo()).getResources()) {
+						Value otherResourceValue = conf.getProviderConfiguration()
+								.get(ImportProvider.PARAM_SOURCE);
+						if (otherResourceValue == null) {
+							continue;
 						}
 
-						if (!allowDuplicate) {
-							log.userError(
-									"Resource is already loaded. Loading duplicate resources is aborted!");
-							return false;
+						String otherResource = otherResourceValue.as(String.class);
+						URI otherAbsolute = URI.create(otherResource);
+						if (projectLoc != null && !otherAbsolute.isAbsolute()) {
+							otherAbsolute = projectLoc.resolve(otherAbsolute);
+						}
+						String action = conf.getActionId();
+						// resource is already loaded into the project
+						if (currentAbsolute.equals(otherAbsolute)
+								&& Objects.equal(actionId, action)) {
+							// check if the resource is loaded with a provider
+							// that allows duplicates
+							boolean allowDuplicate = false;
+							IOProviderDescriptor providerFactory = IOProviderExtension.getInstance()
+									.getFactory(conf.getProviderId());
+							if (providerFactory != null) {
+								allowDuplicate = providerFactory.allowDuplicateResource();
+							}
+
+							if (!allowDuplicate) {
+								log.userError(
+										"Resource is already loaded. Loading duplicate resources is aborted!");
+								// should not proceed with the loop else
+								// duplicate resource will be uploaded.
+								return false;
+							}
 						}
 					}
 				}
-			}
-
-			// enable provider internal caching
-			if (isProjectResource && provider instanceof CachingImportProvider) {
-				((CachingImportProvider) provider).setProvideCache();
-			}
 
-			IOReport report = execute(provider, defReport);
-
-			if (report != null) {
-				// add report to report server
-				ReportService repService = PlatformUI.getWorkbench()
-						.getService(ReportService.class);
-				repService.addReport(report);
+				// enable provider internal caching
+				if (isProjectResource && provider instanceof CachingImportProvider) {
+					((CachingImportProvider) provider).setProvideCache();
+				}
+				IOReport report = execute(provider, defReport);
+
+				if (report != null) {
+					// add report to report server
+					ReportService repService = PlatformUI.getWorkbench()
+							.getService(ReportService.class);
+					repService.addReport(report);
+
+					// show message to user
+					if (report.isSuccess()) {
+						// no message, we rely on the report being
+						// shown/processed
+
+						// let advisor handle results
+						try {
+							getContainer().run(true, false, new IRunnableWithProgress() {
+
+								@Override
+								public void run(IProgressMonitor monitor)
+										throws InvocationTargetException, InterruptedException {
+									monitor.beginTask("Completing operation...",
+											IProgressMonitor.UNKNOWN);
+									try {
+										advisor.handleResults(provider);
+									} finally {
+										monitor.done();
+									}
+								}
 
-				// show message to user
-				if (report.isSuccess()) {
-					// no message, we rely on the report being shown/processed
+							});
+						} catch (InvocationTargetException e) {
+							log.userError("Error processing results:\n"
+									+ e.getCause().getLocalizedMessage(), e.getCause());
+							return false;
+						} catch (Exception e) {
+							log.userError("Error processing results:\n" + e.getLocalizedMessage(),
+									e);
+							return false;
+						}
 
-					// let advisor handle results
-					try {
-						getContainer().run(true, false, new IRunnableWithProgress() {
-
-							@Override
-							public void run(IProgressMonitor monitor)
-									throws InvocationTargetException, InterruptedException {
-								monitor.beginTask("Completing operation...",
-										IProgressMonitor.UNKNOWN);
-								try {
-									advisor.handleResults(getProvider());
-								} finally {
-									monitor.done();
-								}
-							}
+						// add to project service if necessary
+						if (isProjectResource)
+							ps.rememberIO(actionId, getProviderFactory().getIdentifier(), provider);
 
-						});
-					} catch (InvocationTargetException e) {
-						log.userError(
-								"Error processing results:\n" + e.getCause().getLocalizedMessage(),
-								e.getCause());
-						return false;
-					} catch (Exception e) {
-						log.userError("Error processing results:\n" + e.getLocalizedMessage(), e);
+					}
+					else {
+						// error message
+						log.userError(report.getSummary() + "\nPlease see the report for details.");
 						return false;
 					}
-
-					// add to project service if necessary
-					if (isProjectResource)
-						ps.rememberIO(actionId, getProviderFactory().getIdentifier(), provider);
-
-					return true;
-				}
-				else {
-					// error message
-					log.userError(report.getSummary() + "\nPlease see the report for details.");
-					return false;
 				}
+			} catch (IOProviderConfigurationException e) {
+				// user feedback
+				log.userError("Validation of the provider configuration failed:\n"
+						+ e.getLocalizedMessage(), e);
+				return false;
+			}
+			if (uriLocations != null) {
+				uriLoc = uriLocations.poll();
+			}
+			else {
+				break;
 			}
-			else
-				return true;
-		} catch (IOProviderConfigurationException e) {
-			// user feedback
-			log.userError(
-					"Validation of the provider configuration failed:\n" + e.getLocalizedMessage(),
-					e);
-			return false;
 		}
+		return true;
 	}
 
 	/**
@@ -705,7 +758,17 @@ public void run(IProgressMonitor monitor)
 						throws InvocationTargetException, InterruptedException {
 					ATransaction trans = log.begin(defaultReporter.getTaskName());
 					try {
-						IOReport result = provider.execute(new ProgressMonitorIndicator(monitor));
+
+						IOReport result = null;
+						if ((provider instanceof ImportProvider)
+								&& ((ImportProvider) provider).getResourceIdentifier() != null) {
+							result = ((ImportProvider) provider)
+									.execute(new ProgressMonitorIndicator(monitor), null);
+						}
+						else {
+
+							result = provider.execute(new ProgressMonitorIndicator(monitor));
+						}
 						if (result != null) {
 							report.set(result);
 						}
@@ -803,4 +866,43 @@ private void fireContentTypeChanged(IContentType contentType) {
 		}
 	}
 
+	/**
+	 * Method to initialize used locations. It initializes usedLocations as a
+	 * list in case multiple files were selected otherwise as a single resource
+	 * in case of non-file source like HTTP/HTTPS or JDBC URIs.
+	 * 
+	 * @return the usedLocations
+	 */
+	private Queue<URI> initializeUsedLocations() {
+		List<URI> uris = new ArrayList<>();
+		if (provider instanceof ImportProvider) {
+			LocatableInputSupplier<? extends InputStream> source = ((ImportProvider) getProvider())
+					.getSource();
+
+			// XXX Hack to handle the special case when source is a
+			// GZipInputSupplier
+			// In case of other wrapper classes, this method will only return
+			// the first selected file
+			if (source instanceof GZipInputSupplier) {
+				source = ((GZipInputSupplier) source).getSource();
+			}
+
+			if (source instanceof FilesIOSupplier) {
+				uris = ((FilesIOSupplier) source).getLocations();
+			}
+			else {
+				// non-file locations like HTTP/HTTPS or JDBC URIs or when a
+				// single file is selected.
+				URI location = ((ImportProvider) getProvider()).getSource().getLocation();
+				uris = Arrays.asList(location);
+			}
+			// in case of any error dialog is shown during the import and the
+			// user again clicks on the finish then this queue won't be
+			// initialized and the dialog will close. To prevent this, the
+			// queue is initialized every time this function is called.
+			uriLocations = new LinkedList<>(uris);
+		}
+		return uriLocations;
+	}
+
 }
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/AbstractActionUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/AbstractActionUIAdvisor.java
index aea5dba31b..0955a090a3 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/AbstractActionUIAdvisor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/AbstractActionUIAdvisor.java
@@ -24,7 +24,7 @@
 public abstract class AbstractActionUIAdvisor<T> implements ActionUIAdvisor<T> {
 
 	@Override
-	public boolean supportsRemoval() {
+	public boolean supportsRemoval(String resourceId) {
 		return false;
 	}
 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/ActionUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/ActionUIAdvisor.java
index c5ffc67682..1315ff1cc7 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/ActionUIAdvisor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/ActionUIAdvisor.java
@@ -25,10 +25,11 @@ public interface ActionUIAdvisor<T> {
 
 	/**
 	 * States if resource removal is supported.
+	 * @param resourceId the resource identifier
 	 * 
 	 * @return if removal of a single resource based on its ID is supported
 	 */
-	public boolean supportsRemoval();
+	public boolean supportsRemoval(String resourceId);
 
 	/**
 	 * Remove the resource with the given ID.
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/handler/RemoveResourceHandler.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/handler/RemoveResourceHandler.java
index fc732c8a8c..3a54fc6a8a 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/handler/RemoveResourceHandler.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/handler/RemoveResourceHandler.java
@@ -62,7 +62,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 				if (actionUI != null) {
 					IOAction action = IOActionExtension.getInstance().get(resource.getActionId());
 					ActionUIAdvisor<?> advisor = actionUI.getUIAdvisor();
-					if (advisor != null && advisor.supportsRemoval()) {
+					if (advisor != null && advisor.supportsRemoval(resource.getResourceId())) {
 						String name = null;
 						if (resource.getSource() != null) {
 							String location = resource.getSource().toString();
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/tester/ResourceTester.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/tester/ResourceTester.java
index 688f814231..8f29342753 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/tester/ResourceTester.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/action/tester/ResourceTester.java
@@ -61,7 +61,7 @@ public boolean test(Object receiver, String property, Object[] args, Object expe
 	private boolean testAllowRemove(Resource resource) {
 		ActionUIAdvisor<?> advisor = findAdvisor(resource.getActionId());
 		if (advisor != null) {
-			return advisor.supportsRemoval();
+			return advisor.supportsRemoval(resource.getResourceId());
 		}
 		return false;
 	}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/AbstractSchemaActionUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/AbstractSchemaActionUIAdvisor.java
new file mode 100644
index 0000000000..2f423b6302
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/AbstractSchemaActionUIAdvisor.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.schema;
+
+import org.eclipse.ui.PlatformUI;
+
+import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
+import eu.esdihumboldt.hale.common.schema.model.Schema;
+import eu.esdihumboldt.hale.ui.io.action.AbstractActionUIAdvisor;
+import eu.esdihumboldt.hale.ui.service.align.AlignmentService;
+import eu.esdihumboldt.hale.ui.service.instance.InstanceService;
+import eu.esdihumboldt.hale.ui.service.schema.SchemaService;
+
+/**
+ * Base implementation for schema action UI advisors.
+ * 
+ * @param <T> the resource representation type
+ * 
+ * @author Kapil Agnihotri.
+ */
+public abstract class AbstractSchemaActionUIAdvisor<T> extends AbstractActionUIAdvisor<Schema> {
+
+	/**
+	 * Schema service field for currently loaded schemas.
+	 */
+	protected final SchemaService schemaService;
+
+	/**
+	 * Instance service field for different data sets.
+	 */
+	protected InstanceService instanceService;
+
+	/**
+	 * Alignment service field for currently loaded alignment.
+	 */
+	protected AlignmentService alignmentService;
+
+	/**
+	 * Constructor.
+	 */
+	public AbstractSchemaActionUIAdvisor() {
+		super();
+		this.schemaService = PlatformUI.getWorkbench().getService(SchemaService.class);
+		this.instanceService = PlatformUI.getWorkbench().getService(InstanceService.class);;
+		this.alignmentService = PlatformUI.getWorkbench().getService(AlignmentService.class);
+	}
+
+	/**
+	 * Constructor.
+	 * 
+	 * @param schemaService schema service.
+	 * @param instanceService instance service.
+	 * @param alignmentService alignment service.
+	 */
+	public AbstractSchemaActionUIAdvisor(SchemaService schemaService,
+			InstanceService instanceService, AlignmentService alignmentService) {
+		super();
+		this.schemaService = schemaService;
+		this.instanceService = instanceService;
+		this.alignmentService = alignmentService;
+	}
+
+	/**
+	 * Method to remove the specified resource.
+	 * 
+	 * @param resourceId the resource identifier
+	 * @param schemaSpaceId schema space identifier.
+	 * @return true if the schema was removed, false otherwise.
+	 */
+	public boolean removeResource(String resourceId, SchemaSpaceID schemaSpaceId) {
+		return schemaService.removeSchema(resourceId, schemaSpaceId);
+	}
+
+	@Override
+	public boolean supportsRetrieval() {
+		return true;
+	}
+
+	@Override
+	public Class<Schema> getRepresentationType() {
+		return Schema.class;
+	}
+
+	/**
+	 * Method to retrieve the specified schema based on resource ID.
+	 * 
+	 * @param resourceId the resource identifier.
+	 * @param schemaSpaceId schema space identifier.
+	 * @return schema.
+	 */
+	public Schema retrieveResource(String resourceId, SchemaSpaceID schemaSpaceId) {
+		return schemaService.getSchema(resourceId, schemaSpaceId);
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SchemaImportAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SchemaImportAdvisor.java
index 2970a9e7ce..979f8870f0 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SchemaImportAdvisor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SchemaImportAdvisor.java
@@ -68,7 +68,7 @@ public void handleResults(SchemaReader provider) {
 		Schema schema = provider.getSchema();
 
 		SchemaService ss = getService(SchemaService.class);
-		ss.addSchema(schema, spaceID);
+		ss.addSchema(provider.getResourceIdentifier(), schema, spaceID);
 
 		if (ss.getSchemas(spaceID).getMappingRelevantTypes().isEmpty()) {
 			// if no types are present after loading, open editor for mapping
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SourceSchemaActionUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SourceSchemaActionUIAdvisor.java
new file mode 100644
index 0000000000..6bb55f3e03
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/SourceSchemaActionUIAdvisor.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.schema;
+
+import eu.esdihumboldt.hale.common.instance.model.DataSet;
+import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
+import eu.esdihumboldt.hale.common.schema.model.Schema;
+
+/**
+ * Source Schema action UI advisor.
+ * 
+ * @author Kapil Agnihotri.
+ */
+public class SourceSchemaActionUIAdvisor extends AbstractSchemaActionUIAdvisor<Schema> {
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#supportsRemoval(java.lang.String)
+	 */
+	@Override
+	public boolean supportsRemoval(String resourceId) {
+		boolean supportRemoval = true;
+		Schema schema = schemaService.getSchema(resourceId, SchemaSpaceID.SOURCE);
+
+		// check if the source schema is associated with any instance, then
+		// it can't be removed.
+		supportRemoval = !instanceService.getInstanceTypes(DataSet.SOURCE).stream()
+				.anyMatch(type -> schema.getType(type.getName()) != null);
+
+		// if the data is loaded then return false. As from the alignment
+		// condition it might become true if the alignment is not
+		// loaded.
+		if (!supportRemoval) {
+			return supportRemoval;
+		}
+
+		// check if the target schema is mapped to any alignment, then it cannot
+		// be removed.
+		// ! is applied because an empty stream will return false and when an
+		// alignment is present, the condition will return true. However, when
+		// the alignment is mapped then the function should return false.
+		supportRemoval = !alignmentService.getAlignment().getCells().stream()
+				.anyMatch(alignmentCells -> alignmentCells.getSource() != null
+						? alignmentCells.getSource().entries().stream()
+								.anyMatch(k -> schema.getType(
+										k.getValue().getDefinition().getType().getName()) != null)
+						: false);
+
+		return supportRemoval;
+
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#removeResource(java.lang.String)
+	 */
+	@Override
+	public boolean removeResource(String resourceId) {
+		return removeResource(resourceId, SchemaSpaceID.SOURCE);
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#retrieveResource(java.lang.String)
+	 */
+	@Override
+	public Schema retrieveResource(String resourceId) {
+		return retrieveResource(resourceId, SchemaSpaceID.SOURCE);
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/TargetSchemaActionUIAdvisor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/TargetSchemaActionUIAdvisor.java
new file mode 100644
index 0000000000..0cb4a29282
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/schema/TargetSchemaActionUIAdvisor.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.schema;
+
+import eu.esdihumboldt.hale.common.schema.SchemaSpaceID;
+import eu.esdihumboldt.hale.common.schema.model.Schema;
+
+/**
+ * Target Schema action UI advisor.
+ * 
+ * @author Kapil Agnihotri.
+ */
+public class TargetSchemaActionUIAdvisor extends AbstractSchemaActionUIAdvisor<Schema> {
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#supportsRemoval(java.lang.String)
+	 */
+	@Override
+	public boolean supportsRemoval(String resourceId) {
+		boolean supportRemoval = true;
+		Schema schema = schemaService.getSchema(resourceId, SchemaSpaceID.TARGET);
+
+		// check if the target schema is mapped to any alignment, then it cannot
+		// be removed.
+		// ! is applied because an empty stream will return false and when an
+		// alignment is present, the condition will return true. However, when
+		// the alignment is mapped then the function should return false.
+		supportRemoval = !alignmentService.getAlignment().getCells().stream()
+				.anyMatch(alignmentCells -> alignmentCells.getTarget() != null
+						? alignmentCells.getTarget().entries().stream()
+								.anyMatch(k -> schema.getType(
+										k.getValue().getDefinition().getType().getName()) != null)
+						: false);
+
+		return supportRemoval;
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#removeResource(java.lang.String)
+	 */
+	@Override
+	public boolean removeResource(String resourceId) {
+		return removeResource(resourceId, SchemaSpaceID.TARGET);
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.action.ActionUIAdvisor#retrieveResource(java.lang.String)
+	 */
+	@Override
+	public Schema retrieveResource(String resourceId) {
+		return retrieveResource(resourceId, SchemaSpaceID.TARGET);
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSource.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSource.java
new file mode 100644
index 0000000000..a7d9f52527
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSource.java
@@ -0,0 +1,306 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.io.File;
+import java.io.InputStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.dialogs.DialogPage;
+import org.eclipse.jface.preference.FieldEditor;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.ui.PlatformUI;
+
+import eu.esdihumboldt.hale.common.core.io.HaleIO;
+import eu.esdihumboldt.hale.common.core.io.IOProvider;
+import eu.esdihumboldt.hale.common.core.io.ImportProvider;
+import eu.esdihumboldt.hale.common.core.io.extension.IOProviderDescriptor;
+import eu.esdihumboldt.hale.common.core.io.supplier.FilesIOSupplier;
+import eu.esdihumboldt.hale.common.core.io.supplier.LocatableInputSupplier;
+import eu.esdihumboldt.hale.ui.io.ImportSource;
+import eu.esdihumboldt.hale.ui.service.project.ProjectService;
+import eu.esdihumboldt.util.io.IOUtils;
+
+/**
+ * Abstract class to have common functionality to import multiple files at once.
+ * 
+ * @param <P> the supported {@link IOProvider} type
+ * 
+ * @author Kapil Agnihotri
+ */
+public abstract class AbstractMultipleFilesSource<P extends ImportProvider>
+		extends AbstractProviderSource<P> {
+
+	/**
+	 * The file field editor for the source file
+	 */
+	private AbstractMultipleFilesSourceFileFieldEditor sourceFile;
+
+	/**
+	 * The set of supported content types
+	 */
+	private Set<IContentType> supportedTypes;
+
+	private URI projectLocation;
+
+	/**
+	 * @return the projectLocation
+	 */
+	public URI getProjectLocation() {
+		return projectLocation;
+	}
+
+	/**
+	 * @param projectLocation the projectLocation to set
+	 */
+	public void setProjectLocation(URI projectLocation) {
+		this.projectLocation = projectLocation;
+	}
+
+	/**
+	 * @param parent parent
+	 * @param projectLocation location the current project was loaded from. May
+	 *            be <code>null</code>.
+	 * @return
+	 */
+	abstract public AbstractMultipleFilesSourceFileFieldEditor getSourceFile(Composite parent,
+			URI projectLocation);
+
+	/**
+	 * @see ImportSource#createControls(Composite)
+	 */
+	@Override
+	public void createControls(Composite parent) {
+		parent.setLayout(new GridLayout(4, false));
+
+		ProjectService ps = PlatformUI.getWorkbench().getService(ProjectService.class);
+		projectLocation = ps.getLoadLocation() == null ? null : ps.getLoadLocation();
+		boolean projectLocAvailable = projectLocation != null
+				&& "file".equals(projectLocation.getScheme());
+
+		sourceFile = getSourceFile(parent, projectLocation);
+
+		sourceFile.setEmptyStringAllowed(false);
+		sourceFile.setPage(getPage());
+
+		// set content types for file field
+		Collection<IOProviderDescriptor> factories = getConfiguration().getFactories();
+		supportedTypes = new HashSet<IContentType>();
+		for (IOProviderDescriptor factory : factories) {
+			supportedTypes.addAll(factory.getSupportedTypes());
+		}
+
+		sourceFile.setContentTypes(supportedTypes);
+		sourceFile.setPropertyChangeListener(new IPropertyChangeListener() {
+
+			@Override
+			public void propertyChange(PropertyChangeEvent event) {
+				if (event.getProperty().equals(FieldEditor.IS_VALID)) {
+					sourceFile.getStringValues().forEach(k -> updateState(true));
+				}
+				else if (event.getProperty().equals(FieldEditor.VALUE)) {
+					sourceFile.getStringValues().forEach(k -> updateState(true));
+				}
+			}
+
+		});
+
+		Label providerLabel = new Label(parent, SWT.NONE);
+		providerLabel.setText("Import as");
+		// create provider combo
+		ComboViewer providers = createProviders(parent);
+		providers.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 3, 1));
+
+		final Button relativeCheck = new Button(parent, SWT.CHECK);
+		String text = "Use relative paths if possible.";
+		relativeCheck.setText("Use relative paths if possible.");
+		relativeCheck.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				sourceFile.setUseRelativeIfPossible(relativeCheck.getSelection());
+			}
+		});
+		if (!projectLocAvailable) {
+			relativeCheck.setEnabled(false);
+			text += " Only available once the project is saved to a file.";
+		}
+		relativeCheck.setText(text);
+		relativeCheck.setLayoutData(new GridData(SWT.FILL, SWT.BEGINNING, true, false, 4, 1));
+
+		// initial state update
+		updateState(true);
+	}
+
+	/**
+	 * @see AbstractProviderSource#updateContentType()
+	 */
+	@Override
+	protected void updateContentType() {
+
+		if (sourceFile.isValid()) {
+			// determine content type
+			LocatableInputSupplier<? extends InputStream> source = getSource();
+			Collection<IContentType> filteredTypes = HaleIO.findContentTypesFor(supportedTypes,
+					source, sourceFile.getStringValues().get(0));
+			IContentType contentType = null;
+			if (!filteredTypes.isEmpty()) {
+				contentType = filteredTypes.iterator().next();
+			}
+
+			getConfiguration().setContentType(contentType);
+			if (contentType != null) {
+				getPage().setMessage(contentType.getName(), DialogPage.INFORMATION);
+			}
+			else {
+				getPage().setMessage(null);
+			}
+
+			super.updateContentType();
+		}
+	}
+
+	/**
+	 * @see AbstractProviderSource#isValidSource()
+	 */
+	@Override
+	protected boolean isValidSource() {
+		return sourceFile.isValid();
+	}
+
+	/**
+	 * @see AbstractSource#onActivate()
+	 */
+	@Override
+	public void onActivate() {
+		sourceFile.setFocus();
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.source.AbstractProviderSource#getSource()
+	 */
+	@Override
+	protected LocatableInputSupplier<? extends InputStream> getSource() {
+		List<String> stringValues = sourceFile.getStringValues();
+		List<File> files = new ArrayList<File>();
+		List<URI> uris = new ArrayList<>();
+		File file = new File(stringValues.get(0));
+		if (file.isAbsolute()) {
+			for (String s : stringValues) {
+				files.add(new File(s));
+				uris.add(new File(s).toURI());
+			}
+		}
+		else {
+			for (String path : stringValues) {
+				URI relativeURI = IOUtils.relativeFileToURI(new File(path));
+				File absoluteFile = new File(projectLocation.resolve(relativeURI));
+				files.add(absoluteFile);
+				uris.add(relativeURI);
+			}
+		}
+		FilesIOSupplier filesIOSupplier = new FilesIOSupplier(files, uris);
+		return filesIOSupplier;
+	}
+
+	/**
+	 * Update the provider selector when the content type has changed. This is
+	 * based on the content type stored in the source configuration.
+	 */
+	@Override
+	protected void updateProvider() {
+		IContentType contentType = getConfiguration().getContentType();
+		if (contentType != null) {
+			IOProviderDescriptor lastSelected = null;
+			ISelection provSel = getProviders().getSelection();
+			if (!provSel.isEmpty() && provSel instanceof IStructuredSelection) {
+				lastSelected = (IOProviderDescriptor) ((IStructuredSelection) provSel)
+						.getFirstElement();
+			}
+
+			List<IOProviderDescriptor> supported = HaleIO
+					.filterFactories(getConfiguration().getFactories(), contentType);
+			getProviders().setInput(supported);
+
+			if (lastSelected != null && supported.contains(lastSelected)) {
+				// reuse old selection
+				getProviders().setSelection(new StructuredSelection(lastSelected), true);
+			}
+			else if (!supported.isEmpty()) {
+				// select first provider
+				getProviders().setSelection(new StructuredSelection(supported.get(0)), true);
+			}
+
+			getProviders().getControl().setEnabled(supported.size() > 1);
+		}
+		else {
+			getProviders().setInput(null);
+			getProviders().getControl().setEnabled(false);
+		}
+
+	}
+
+	/**
+	 * Update the page state. This includes setting a provider factory on the
+	 * wizard if applicable and setting the complete state of the page.<br>
+	 * <br>
+	 * This should be called in {@link #createControls(Composite)} to initialize
+	 * the page state.
+	 * 
+	 * @param updateContentType if <code>true</code> the content type and the
+	 *            supported providers will be updated before updating the page
+	 *            state
+	 */
+	@Override
+	protected void updateState(boolean updateContentType) {
+		if (updateContentType) {
+			updateContentType();
+		}
+
+		// update provider factory
+		ISelection provSel = getProviders().getSelection();
+		if (!provSel.isEmpty() && provSel instanceof IStructuredSelection) {
+			getConfiguration().setProviderFactory(
+					(IOProviderDescriptor) ((IStructuredSelection) provSel).getFirstElement());
+		}
+		else {
+			getConfiguration().setProviderFactory(null);
+		}
+
+		getPage().setPageComplete(isValidSource() && getConfiguration().getContentType() != null
+				&& getConfiguration().getProviderFactory() != null);
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSourceFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSourceFileFieldEditor.java
new file mode 100644
index 0000000000..5de0afeb7b
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/AbstractMultipleFilesSourceFileFieldEditor.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.io.File;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.core.runtime.content.IContentType;
+import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.PlatformUI;
+
+import eu.esdihumboldt.hale.ui.common.CommonSharedImages;
+import eu.esdihumboldt.hale.ui.service.project.RecentProjectsMenu;
+import eu.esdihumboldt.hale.ui.service.project.RecentResources;
+import eu.esdihumboldt.hale.ui.util.io.ExtendedFileFieldEditor;
+import eu.esdihumboldt.hale.ui.util.io.OpenFileFieldEditor;
+import eu.esdihumboldt.util.Pair;
+import eu.esdihumboldt.util.io.IOUtils;
+
+/**
+ * Abstract class to have common functionalities for the implementation of
+ * {@link OpenFileFieldEditor} with support for relative URIs with regard to the
+ * current project's location. Applicable when importing multiple files.
+ * 
+ * @author Kapil Agnihotri
+ */
+public abstract class AbstractMultipleFilesSourceFileFieldEditor extends OpenFileFieldEditor {
+
+	private final URI projectURI;
+	private boolean useRelative;
+	private Button historyButton;
+	private Text textField;
+	private final int validationStrategy;
+	private static final String LINE_SEPARATOR = "line.separator";
+
+	/**
+	 * @see ExtendedFileFieldEditor#ExtendedFileFieldEditor(String, String,
+	 *      boolean, int, Composite, int )
+	 */
+	@SuppressWarnings("javadoc")
+	public AbstractMultipleFilesSourceFileFieldEditor(String name, String labelText,
+			int validationStrategy, Composite parent, URI projectURI, int style) {
+		super(name, labelText, false, validationStrategy, parent, style);
+		this.validationStrategy = validationStrategy;
+		this.projectURI = projectURI;
+	}
+
+	/**
+	 * Sets the editor to allow relative values. The projectURI has to be
+	 * supplied during construction to support this feature.
+	 * 
+	 * @param useRelative the new value
+	 */
+	public void setUseRelativeIfPossible(boolean useRelative) {
+		List<String> filepaths = getFilepathsAsList(getTextControl().getText().trim());
+		StringBuffer paths = new StringBuffer();
+		if (this.useRelative && !useRelative) {
+			// incase user toggles relative path check box.
+			for (String path : filepaths) {
+				File f = new File(path);
+				String absolutePath = resolve(f).getAbsolutePath();
+				paths.append(absolutePath).append(System.getProperty(LINE_SEPARATOR));
+			}
+			this.useRelative = false;
+		}
+		else if (!this.useRelative && useRelative && projectURI != null) {
+			this.useRelative = true;
+			for (String path : filepaths) {
+				File f = new File(path);
+				URI absoluteSelected = f.toURI();
+				URI relativeSelected = IOUtils.getRelativePath(absoluteSelected, projectURI);
+				if (!relativeSelected.isAbsolute()) {
+					f = new File(relativeSelected.toString());
+					paths.append(f.getPath()).append(System.getProperty(LINE_SEPARATOR));
+				}
+			}
+		}
+		getTextControl().setText(paths.toString());
+		// here it is important to trigger the value changed event otherwise,
+		// toggling relative path check box shows weird behavior and throws NPE.
+		getTextControl().setFocus();
+		valueChanged();
+	}
+
+	/**
+	 * @see FileFieldEditor#changePressed()
+	 */
+	@Override
+	protected String changePressed() {
+		String filepaths = getTextControl().getText();
+		List<String> filepathsAsList = getFilepathsAsList(filepaths);
+		File f = null;
+		if (filepathsAsList != null && filepathsAsList.size() > 0) {
+			f = new File(filepathsAsList.get(0));
+			f = resolve(f);
+		}
+		List<File> d = getFiles(f);
+		StringBuffer sb = new StringBuffer();
+		List<String> processedFiles = processFiles(d);
+		processedFiles.forEach(k -> sb.append(k).append(System.getProperty(LINE_SEPARATOR)));
+		return sb.toString();
+	}
+
+	/**
+	 * Process a selected file and produce the path to use.
+	 * 
+	 * @param files List of files to be processed.
+	 * 
+	 * @return the list of paths.
+	 */
+	protected List<String> processFiles(List<File> files) {
+		if (files == null) {
+			return null;
+		}
+		List<String> paths = new ArrayList<String>();
+		if (useRelative) {
+			files.forEach(k -> {
+				File d = k.getAbsoluteFile();
+				URI absoluteSelected = d.toURI();
+				URI relativeSelected = IOUtils.getRelativePath(absoluteSelected, projectURI);
+				if (!relativeSelected.isAbsolute()) {
+					File file = new File(relativeSelected.toString());
+					paths.add(file.getPath());
+				}
+			});
+		}
+		else {
+			files.forEach(k -> {
+				File d = k.getAbsoluteFile();
+				paths.add(d.getPath());
+			});
+		}
+		return paths;
+	}
+
+	@Override
+	protected boolean checkState() {
+		String msg = null;
+
+		String path = getTextControl().getText();
+		if (path != null) {
+			path = path.trim();
+		}
+		else {
+			path = "";//$NON-NLS-1$
+		}
+		if (path.length() == 0) {
+			if (!isEmptyStringAllowed()) {
+				msg = getErrorMessage();
+			}
+		}
+		else {
+			String errorMsg = restrictExtensions(path);
+			if (errorMsg != null && !errorMsg.isEmpty()) {
+				showErrorMessage(errorMsg);
+				return false;
+			}
+			Optional<String> invalidFilePath = getFilepathsAsList(path).stream()
+					.filter(k -> (resolve(new File(k)) == null) || !(resolve(new File(k))).isFile())
+					.findAny();
+			if (invalidFilePath.isPresent()) {
+				msg = getErrorMessage();
+			}
+		}
+
+		if (msg != null) { // error
+			showErrorMessage(msg);
+			return false;
+		}
+
+		if (doCheckState()) { // OK!
+			clearErrorMessage();
+			return true;
+		}
+		msg = getErrorMessage(); // subclass might have changed it in the
+									// #doCheckState()
+		if (msg != null) {
+			showErrorMessage(msg);
+		}
+		return false;
+	}
+
+	/**
+	 * Method to restrict files with specific extensions.
+	 * 
+	 * @param path file path.
+	 * @return response message based on the checks.
+	 */
+	protected String restrictExtensions(String path) {
+		String msg = null;
+		List<String> filepaths = getFilepathsAsList(path);
+
+		// check if the selected files are with different extensions.
+		Set<String> allSelectedFileExtensions = filepaths.stream()
+				.map(p -> p.substring(p.lastIndexOf("."))).collect(Collectors.toSet());
+		if (allSelectedFileExtensions.size() > 1) {
+			msg = "All files must be of the same format!";
+			return msg;
+		}
+		return msg;
+
+	}
+
+	/**
+	 * Resolve a files existence.
+	 * 
+	 * @param f file.
+	 * @return null if file does not exists else the file.
+	 */
+	private File resolve(File f) {
+		// first find absolute
+		File resolved;
+		if (f.isAbsolute())
+			resolved = f;
+		else if (useRelative)
+			resolved = new File(projectURI.resolve(IOUtils.relativeFileToURI(f)));
+		else
+			resolved = null;
+
+		// then check existence
+		if (resolved != null && resolved.exists())
+			return resolved;
+		else
+			return null;
+	}
+
+	// recent resources support
+
+	@Override
+	protected void adjustForNumColumns(int numColumns) {
+		((GridData) getTextControl().getLayoutData()).horizontalSpan = numColumns - 2;
+	}
+
+	@Override
+	protected void doFillIntoGrid(Composite parent, int numColumns) {
+		super.doFillIntoGrid(parent, numColumns - 1);
+	}
+
+	@Override
+	public Text getTextControl(Composite parent) {
+		// ensure resource control is added before the text control
+		historyButton = new Button(parent, SWT.PUSH | SWT.FLAT);
+		historyButton.setToolTipText("Choose from recent files");
+		historyButton.setImage(
+				CommonSharedImages.getImageRegistry().get(CommonSharedImages.IMG_HISTORY));
+		historyButton.setEnabled(false);
+
+		if (textField == null) {
+			textField = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
+			textField.setFont(parent.getFont());
+
+			switch (validationStrategy) {
+			case VALIDATE_ON_KEY_STROKE:
+				textField.addKeyListener(new KeyAdapter() {
+
+					@Override
+					public void keyReleased(KeyEvent e) {
+						valueChanged();
+					}
+				});
+				textField.addFocusListener(new FocusAdapter() {
+
+					// Ensure that the value is checked on focus loss in case we
+					// missed a keyRelease or user hasn't released key.
+					// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=214716
+					@Override
+					public void focusLost(FocusEvent e) {
+						valueChanged();
+					}
+				});
+
+				break;
+			case VALIDATE_ON_FOCUS_LOST:
+				textField.addKeyListener(new KeyAdapter() {
+
+					@Override
+					public void keyPressed(KeyEvent e) {
+						clearErrorMessage();
+					}
+				});
+				textField.addFocusListener(new FocusAdapter() {
+
+					@Override
+					public void focusGained(FocusEvent e) {
+						refreshValidState();
+					}
+
+					@Override
+					public void focusLost(FocusEvent e) {
+						valueChanged();
+					}
+				});
+				break;
+			default:
+				Assert.isTrue(false, "Unknown validate strategy");//$NON-NLS-1$
+			}
+			textField.addDisposeListener(event -> textField = null);
+			textField.setTextLimit(UNLIMITED);
+
+		}
+		else {
+			checkParent(textField, parent);
+		}
+
+		return textField;
+	}
+
+	@Override
+	public void setContentTypes(Set<IContentType> types) {
+		super.setContentTypes(types);
+
+		RecentResources rr = PlatformUI.getWorkbench().getService(RecentResources.class);
+		if (rr != null) {
+			final List<Pair<URI, IContentType>> files = rr.getRecent(types, true);
+
+			if (!files.isEmpty()) {
+				historyButton.addSelectionListener(new SelectionAdapter() {
+
+					@Override
+					public void widgetSelected(SelectionEvent e) {
+						Menu filesMenu = new Menu(historyButton);
+						for (Pair<URI, IContentType> pair : files) {
+							final File file;
+							try {
+								file = new File(pair.getFirst());
+								if (file.exists()) {
+									// only offer existing files
+
+									MenuItem item = new MenuItem(filesMenu, SWT.PUSH);
+									item.setText(RecentProjectsMenu.shorten(file.toString(), 80,
+											file.getName().length()));
+									item.addSelectionListener(new SelectionAdapter() {
+
+										@Override
+										public void widgetSelected(SelectionEvent e) {
+											List<String> texts = processFiles(Arrays.asList(file));
+											if (texts != null) {
+												StringBuffer selectedFiles = new StringBuffer(
+														getTextControl().getText());
+												selectedFiles.append(texts.get(0))
+														.append(System.getProperty(LINE_SEPARATOR));
+												getTextControl().setText(selectedFiles.toString());
+												getTextControl().setFocus();
+												valueChanged();
+
+											}
+										}
+									});
+								}
+							} catch (Exception e1) {
+								// ignore
+							}
+						}
+
+						Point histLoc = historyButton.getParent()
+								.toDisplay(historyButton.getLocation());
+						filesMenu.setLocation(histLoc.x, histLoc.y + historyButton.getSize().y);
+						filesMenu.setVisible(true);
+					}
+				});
+				historyButton.setEnabled(true);
+			}
+		}
+	}
+
+	@Override
+	public int getNumberOfControls() {
+		return super.getNumberOfControls() + 1;
+	}
+
+	/**
+	 * @return the historyButton
+	 */
+	public Button getHistoryButton() {
+		return historyButton;
+	}
+
+	/**
+	 * Method to return the list of filepaths from filepath string delimited by
+	 * <code>System.getProperty(LINE_SEPARATOR)</code>.
+	 * 
+	 * @param filepaths file path string, delimited by
+	 *            <code>System.getProperty(LINE_SEPARATOR)</code>.
+	 * @return list of file paths after splitting.
+	 */
+	protected List<String> getFilepathsAsList(String filepaths) {
+		String[] split = filepaths.trim().split(System.getProperty(LINE_SEPARATOR));
+
+		List<String> collect = Arrays.asList(split).stream().filter(s -> !s.isEmpty())
+				.collect(Collectors.toList());
+		return collect;
+
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/FileSourceFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/FileSourceFileFieldEditor.java
index ce36c52bf8..68cd58190c 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/FileSourceFileFieldEditor.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/FileSourceFileFieldEditor.java
@@ -103,10 +103,12 @@ public FileSourceFileFieldEditor(String name, String labelText, int validationSt
 	 */
 	public void setUseRelativeIfPossible(boolean useRelative) {
 		if (this.useRelative && !useRelative) {
+			// incase user toggles relative path check box.
 			File f = new File(getTextControl().getText());
 			f = resolve(f);
-			if (f != null)
+			if (f != null) {
 				getTextControl().setText(f.getAbsolutePath());
+			}
 			this.useRelative = false;
 		}
 		else if (!this.useRelative && useRelative && projectURI != null) {
@@ -114,10 +116,15 @@ else if (!this.useRelative && useRelative && projectURI != null) {
 			File f = new File(getTextControl().getText());
 			URI absoluteSelected = f.toURI();
 			URI relativeSelected = IOUtils.getRelativePath(absoluteSelected, projectURI);
-			if (!relativeSelected.isAbsolute())
+			if (!relativeSelected.isAbsolute()) {
 				f = new File(relativeSelected.toString());
-			getTextControl().setText(f.getPath());
+				getTextControl().setText(f.getPath());
+			}
 		}
+		// here it is important to trigger the value changed event otherwise,
+		// toggling relative path check box shows weird behavior and throws NPE.
+		getTextControl().setFocus();
+		valueChanged();
 	}
 
 	/**
@@ -125,7 +132,7 @@ else if (!this.useRelative && useRelative && projectURI != null) {
 	 */
 	@Override
 	protected String changePressed() {
-		File f = new File(getTextControl().getText());
+		File f = new File(getTextControl().getText().trim());
 		f = resolve(f);
 		File d = getFile(f);
 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSource.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSource.java
new file mode 100644
index 0000000000..f7cac79e7f
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSource.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.net.URI;
+
+import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+import eu.esdihumboldt.hale.common.core.io.ImportProvider;
+import eu.esdihumboldt.hale.common.instance.io.InstanceReader;
+
+/**
+ * File import source for importing multiple instance files.
+ * 
+ * @author Kapil Agnihotri
+ */
+public class MultipleInstanceFilesSource<P extends ImportProvider>
+		extends AbstractMultipleFilesSource<InstanceReader> {
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.source.AbstractMultipleFilesSource#getSourceFile(org.eclipse.swt.widgets.Composite,
+	 *      java.net.URI)
+	 */
+	@Override
+	public AbstractMultipleFilesSourceFileFieldEditor getSourceFile(Composite parent,
+			URI projectLocation) {
+		return new MultipleInstanceFilesSourceFileFieldEditor("sourceFile", "Source files:",
+				FileFieldEditor.VALIDATE_ON_KEY_STROKE, parent, projectLocation,
+				SWT.MULTI | SWT.SHEET);
+	}
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSourceFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSourceFileFieldEditor.java
new file mode 100644
index 0000000000..15b3d8aded
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleInstanceFilesSourceFileFieldEditor.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.net.URI;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.swt.widgets.Composite;
+
+import eu.esdihumboldt.hale.ui.util.io.ExtendedFileFieldEditor;
+
+/**
+ * Implementation of {@link AbstractMultipleFilesSourceFileFieldEditor} for
+ * importing multiple instances with support for relative URIs with regard to
+ * the current project's location.
+ * 
+ * @author Kapil Agnihotri
+ */
+public class MultipleInstanceFilesSourceFileFieldEditor
+		extends AbstractMultipleFilesSourceFileFieldEditor {
+
+	/**
+	 * @see ExtendedFileFieldEditor#ExtendedFileFieldEditor(String, String,
+	 *      boolean, int, Composite, int )
+	 */
+	@SuppressWarnings("javadoc")
+	public MultipleInstanceFilesSourceFileFieldEditor(String name, String labelText,
+			int validationStrategy, Composite parent, URI projectURI, int style) {
+		super(name, labelText, validationStrategy, parent, projectURI, style);
+	}
+
+	/**
+	 * @see eu.esdihumboldt.hale.ui.io.source.AbstractMultipleFilesSourceFileFieldEditor#restrictExtensions(java.lang.String)
+	 */
+	@Override
+	protected String restrictExtensions(String path) {
+		// return an empty string as for now as all the extensions are allowed
+		// for reading multiple instances at once.
+
+		List<String> filepaths = getFilepathsAsList(path);
+
+		// check if the selected files are with different extensions.
+		Set<String> allSelectedFileExtensions = filepaths.stream()
+				.map(p -> p.substring(p.lastIndexOf("."))).collect(Collectors.toSet());
+		if (allSelectedFileExtensions.size() > 1) {
+			return "All files must be of the same format!";
+		}
+
+		// return empty string if everything is perfect. Cannot return null as
+		// it will be returned from the
+		// MultipleSchemaFilesSourceFileFieldEditor.
+		return "";
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSource.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSource.java
new file mode 100644
index 0000000000..f1670b3c7d
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSource.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.net.URI;
+
+import org.eclipse.jface.preference.FileFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+
+import eu.esdihumboldt.hale.common.core.io.IOProvider;
+import eu.esdihumboldt.hale.common.core.io.ImportProvider;
+import eu.esdihumboldt.hale.common.schema.io.SchemaReader;
+
+/**
+ * File import source to import multiple schema files.
+ * 
+ * @param <P> the supported {@link IOProvider} type
+ * 
+ * @author Kapil Agnihotri
+ */
+public class MultipleSchemaFilesSource<P extends ImportProvider>
+		extends AbstractMultipleFilesSource<SchemaReader> {
+
+	/**
+	 * 
+	 * @see eu.esdihumboldt.hale.ui.io.source.AbstractMultipleFilesSource#getSourceFile(org.eclipse.swt.widgets.Composite,
+	 *      java.net.URI)
+	 */
+	@Override
+	public AbstractMultipleFilesSourceFileFieldEditor getSourceFile(Composite parent,
+			URI projectLocation) {
+		return new MultipleSchemaFilesSourceFileFieldEditor("sourceFile", "Source files:",
+				FileFieldEditor.VALIDATE_ON_KEY_STROKE, parent, projectLocation,
+				SWT.MULTI | SWT.SHEET);
+	}
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSourceFileFieldEditor.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSourceFileFieldEditor.java
new file mode 100644
index 0000000000..62af66c09c
--- /dev/null
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/io/source/MultipleSchemaFilesSourceFileFieldEditor.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2021 wetransform GmbH
+ * 
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Contributors:
+ *     wetransform GmbH <http://www.wetransform.to>
+ */
+
+package eu.esdihumboldt.hale.ui.io.source;
+
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.eclipse.swt.widgets.Composite;
+
+import eu.esdihumboldt.hale.ui.util.io.ExtendedFileFieldEditor;
+
+/**
+ * Implementation of {@link AbstractMultipleFilesSourceFileFieldEditor} for
+ * importing multiple Schema(s).
+ * 
+ * @author Kapil Agnihotri
+ */
+public class MultipleSchemaFilesSourceFileFieldEditor
+		extends AbstractMultipleFilesSourceFileFieldEditor {
+
+	/**
+	 * @see ExtendedFileFieldEditor#ExtendedFileFieldEditor(String, String,
+	 *      boolean, int, Composite, int )
+	 */
+	@SuppressWarnings("javadoc")
+	public MultipleSchemaFilesSourceFileFieldEditor(String name, String labelText,
+			int validationStrategy, Composite parent, URI projectURI, int style) {
+		super(name, labelText, validationStrategy, parent, projectURI, style);
+	}
+
+	/**
+	 * 
+	 * @see eu.esdihumboldt.hale.ui.io.source.AbstractMultipleFilesSourceFileFieldEditor#restrictExtensions(java.lang.String)
+	 */
+	@Override
+	protected String restrictExtensions(String path) {
+		String msg = null;
+
+		List<String> filepaths = getFilepathsAsList(path);
+		// check if the selected files are with different extensions.
+		Set<String> allSelectedFileExtensions = filepaths.stream()
+				.map(p -> p.substring(p.lastIndexOf("."))).collect(Collectors.toSet());
+		if (allSelectedFileExtensions.size() > 1) {
+			msg = "All files must be of the same format!";
+			return msg;
+		}
+
+		// check if selected files are of the extensions that doesn't allow
+		// multiple schema imports.
+		List<String> extensions = Arrays.asList(".csv", ".xml");
+		long count = filepaths.stream().filter(p -> extensions.stream().anyMatch(p::contains))
+				.count();
+		if (filepaths.size() > 1 && count > 1) {
+			msg = String.format("Cannot import multiple files of %s extension.",
+					allSelectedFileExtensions.iterator().next());
+		}
+		return msg;
+	}
+
+}
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaService.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaService.java
index 757505f47c..f5515ffcf4 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaService.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaService.java
@@ -44,14 +44,36 @@ public interface SchemaService extends TransformationSchemas {
 	@Override
 	public SchemaSpace getSchemas(SchemaSpaceID spaceID);
 
+	/**
+	 * Get schema for a specified resourceId.
+	 * 
+	 * @param resourceID resource Id of the schema to find.
+	 * @param spaceID the schema space ID, either {@link SchemaSpaceID#SOURCE}
+	 *            or {@link SchemaSpaceID#TARGET}
+	 * @return schema.
+	 */
+	public Schema getSchema(String resourceID, SchemaSpaceID spaceID);
+
 	/**
 	 * Add a schema to the source or target schema space.
 	 * 
+	 * @param resourceID resource id of the schema to be added.
+	 * 
 	 * @param schema the schema to add
 	 * @param spaceID the schema space ID, either {@link SchemaSpaceID#SOURCE}
 	 *            or {@link SchemaSpaceID#TARGET}
 	 */
-	public void addSchema(Schema schema, SchemaSpaceID spaceID);
+	public void addSchema(String resourceID, Schema schema, SchemaSpaceID spaceID);
+
+	/**
+	 * Removes a schema to the source schema space from the project view.
+	 * 
+	 * @param resourceID of the schema to be removed.
+	 * @param spaceID the schema space ID, either {@link SchemaSpaceID#SOURCE}
+	 *            or {@link SchemaSpaceID#TARGET}
+	 * @return true if the schema was removed, false otherwise.
+	 */
+	public boolean removeSchema(String resourceID, SchemaSpaceID spaceID);
 
 	/**
 	 * Removes all schemas from the source or target schema space.
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceAdapter.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceAdapter.java
index 58891ca217..423ef03017 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceAdapter.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceAdapter.java
@@ -38,6 +38,14 @@ public void schemaAdded(SchemaSpaceID spaceID, Schema schema) {
 		// override me
 	}
 
+	/**
+	 * @see eu.esdihumboldt.hale.ui.service.schema.SchemaServiceListener#schemaRemoved(eu.esdihumboldt.hale.common.schema.SchemaSpaceID)
+	 */
+	@Override
+	public void schemaRemoved(SchemaSpaceID spaceID) {
+		// override me
+	}
+
 	/**
 	 * @see SchemaServiceListener#schemasCleared(SchemaSpaceID)
 	 */
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceListener.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceListener.java
index 81f67a55b8..62a20898d5 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceListener.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/SchemaServiceListener.java
@@ -39,6 +39,15 @@ public interface SchemaServiceListener {
 	 */
 	public void schemaAdded(SchemaSpaceID spaceID, Schema schema);
 
+	/**
+	 * Called when the source or target schema have been removed from the
+	 * project(resources) view.
+	 * 
+	 * @param spaceID the schema space ID, either {@link SchemaSpaceID#SOURCE}
+	 *            or {@link SchemaSpaceID#TARGET}
+	 */
+	public void schemaRemoved(SchemaSpaceID spaceID);
+
 	/**
 	 * Called when the source or target schema space have been cleared.
 	 * 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/AbstractSchemaService.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/AbstractSchemaService.java
index 574763a74b..735998fa5b 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/AbstractSchemaService.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/AbstractSchemaService.java
@@ -89,6 +89,18 @@ protected void notifySchemaAdded(SchemaSpaceID spaceID, Schema schema) {
 		}
 	}
 
+	/**
+	 * Called when a single source or a target schema has been cleared.
+	 * 
+	 * @param spaceID the schema space ID, either {@link SchemaSpaceID#SOURCE}
+	 *            or {@link SchemaSpaceID#TARGET}
+	 */
+	protected void notifySchemaRemoved(SchemaSpaceID spaceID) {
+		for (SchemaServiceListener listener : listeners) {
+			listener.schemaRemoved(spaceID);
+		}
+	}
+
 	/**
 	 * Called when the source or target schema space have been cleared.
 	 * 
diff --git a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/SchemaServiceImpl.java b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/SchemaServiceImpl.java
index f975774ec9..eb76ab94f6 100644
--- a/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/SchemaServiceImpl.java
+++ b/ui/plugins/eu.esdihumboldt.hale.ui/src/eu/esdihumboldt/hale/ui/service/schema/internal/SchemaServiceImpl.java
@@ -44,7 +44,7 @@
 import eu.esdihumboldt.hale.common.schema.model.SchemaSpace;
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition;
 import eu.esdihumboldt.hale.common.schema.model.constraint.type.MappingRelevantFlag;
-import eu.esdihumboldt.hale.common.schema.model.impl.DefaultSchemaSpace;
+import eu.esdihumboldt.hale.common.schema.model.impl.ResourceSchemaSpace;
 import eu.esdihumboldt.hale.ui.service.project.ProjectService;
 import eu.esdihumboldt.hale.ui.service.project.internal.AbstractRemoveResourcesOperation;
 import eu.esdihumboldt.hale.ui.service.schema.SchemaService;
@@ -62,7 +62,7 @@ public class SchemaServiceImpl extends AbstractSchemaService {
 	/**
 	 * Maps schema space IDs to schema spaces
 	 */
-	private static final Map<SchemaSpaceID, DefaultSchemaSpace> spaces = new HashMap<SchemaSpaceID, DefaultSchemaSpace>();
+	private static final Map<SchemaSpaceID, ResourceSchemaSpace> spaces = new HashMap<SchemaSpaceID, ResourceSchemaSpace>();
 
 	/**
 	 * @see AbstractSchemaService#AbstractSchemaService(ProjectService)
@@ -71,6 +71,23 @@ public SchemaServiceImpl(ProjectService projectService) {
 		super(projectService);
 	}
 
+	/**
+	 * @see eu.esdihumboldt.hale.ui.service.schema.SchemaService#getSchema(java.lang.String,
+	 *      eu.esdihumboldt.hale.common.schema.SchemaSpaceID)
+	 */
+	@Override
+	public Schema getSchema(String resourceID, SchemaSpaceID spaceID) {
+		Preconditions.checkNotNull(resourceID);
+
+		synchronized (spaces) {
+			ResourceSchemaSpace space = spaces.get(spaceID);
+			if (space != null) {
+				return space.getSchemas(resourceID);
+			}
+			return null;
+		}
+	}
+
 	/**
 	 * @see SchemaService#getSchemas(SchemaSpaceID)
 	 */
@@ -79,9 +96,9 @@ public SchemaSpace getSchemas(SchemaSpaceID spaceID) {
 		Preconditions.checkNotNull(spaceID);
 
 		synchronized (spaces) {
-			DefaultSchemaSpace space = spaces.get(spaceID);
+			ResourceSchemaSpace space = spaces.get(spaceID);
 			if (space == null) {
-				space = new DefaultSchemaSpace();
+				space = new ResourceSchemaSpace();
 				spaces.put(spaceID, space);
 			}
 			return space;
@@ -89,21 +106,38 @@ public SchemaSpace getSchemas(SchemaSpaceID spaceID) {
 	}
 
 	/**
-	 * @see SchemaService#addSchema(Schema, SchemaSpaceID)
+	 * @see eu.esdihumboldt.hale.ui.service.schema.SchemaService#addSchema(java.lang.String,
+	 *      eu.esdihumboldt.hale.common.schema.model.Schema,
+	 *      eu.esdihumboldt.hale.common.schema.SchemaSpaceID)
 	 */
 	@Override
-	public void addSchema(Schema schema, SchemaSpaceID spaceID) {
+	public void addSchema(String resourceID, Schema schema, SchemaSpaceID spaceID) {
 		Preconditions.checkNotNull(spaceID);
 
 		SchemaIO.loadMappingRelevantTypesConfig(schema, spaceID, getProjectService()
 				.getConfigurationService());
 
-		DefaultSchemaSpace space = (DefaultSchemaSpace) getSchemas(spaceID);
-		space.addSchema(schema);
+		ResourceSchemaSpace space = (ResourceSchemaSpace) getSchemas(spaceID);
+		space.addSchema(resourceID, schema);
 
 		notifySchemaAdded(spaceID, schema);
 	}
 
+	/**
+	 * @see eu.esdihumboldt.hale.ui.service.schema.SchemaService#removeSchema(java.lang.String,
+	 *      eu.esdihumboldt.hale.common.schema.SchemaSpaceID)
+	 */
+	@Override
+	public boolean removeSchema(String resourceID, SchemaSpaceID spaceID) {
+		Preconditions.checkNotNull(spaceID);
+
+		ResourceSchemaSpace space = (ResourceSchemaSpace) getSchemas(spaceID);
+		Schema removedSchema = space.removeSchema(resourceID);
+		notifySchemaRemoved(spaceID);
+		notifyMappableTypesChanged(spaceID, space.getTypes());
+		return removedSchema != null ? true : false;
+	}
+
 	/**
 	 * @see SchemaService#clearSchemas(SchemaSpaceID)
 	 */
diff --git a/util/features/eu.esdihumboldt.util.feature.resource/feature.xml b/util/features/eu.esdihumboldt.util.feature.resource/feature.xml
index 8499845b02..aa29b51457 100644
--- a/util/features/eu.esdihumboldt.util.feature.resource/feature.xml
+++ b/util/features/eu.esdihumboldt.util.feature.resource/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.esdihumboldt.util.feature.resource"
       label="HALE resources feature"
-      version="4.0.0.qualifier">
+      version="4.1.0.qualifier">
 
    <license>
       Licenses of the individual features and plug-ins apply.
@@ -32,4 +32,11 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="eu.esdihumboldt.util.resource.schemas.end"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/util/plugins/eu.esdihumboldt.util.cli/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.cli/META-INF/MANIFEST.MF
index 00a225ab34..0aeda76d32 100644
--- a/util/plugins/eu.esdihumboldt.util.cli/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.cli/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: hale CLI API
 Bundle-SymbolicName: eu.esdihumboldt.util.cli;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension,
diff --git a/util/plugins/eu.esdihumboldt.util.config.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.config.test/META-INF/MANIFEST.MF
index 3d2d8dac6a..7993cd43f3 100644
--- a/util/plugins/eu.esdihumboldt.util.config.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.config.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Configuration utilities tests
 Bundle-SymbolicName: eu.esdihumboldt.config.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.util.config;bundle-version="3.5.0"
 Automatic-Module-Name: eu.esdihumboldt.config.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/util/plugins/eu.esdihumboldt.util.config/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.config/META-INF/MANIFEST.MF
index af959df49a..65ffad19ee 100644
--- a/util/plugins/eu.esdihumboldt.util.config/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.config/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Configuration Utilities
 Bundle-SymbolicName: eu.esdihumboldt.util.config
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Automatic-Module-Name: eu.esdihumboldt.util.config
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF
index 827389b3ec..8963f6aaea 100644
--- a/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.geometry.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geometry utilities tests
 Bundle-SymbolicName: eu.esdihumboldt.util.geometry.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.util.geometry;bundle-version="3.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.cache;version="17.0.0",
diff --git a/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF
index dafd24f8c7..6242486743 100644
--- a/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.geometry/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geometry Utilities
 Bundle-SymbolicName: eu.esdihumboldt.util.geometry;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.locationtech.jts;version="1.13.0",
  org.locationtech.jts.algorithm;version="1.13.0",
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF
index bbe94aaf93..4ad72e4da5 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy.meta.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Meta Class Extension
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy.meta.extension;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0"
 Import-Package: de.fhg.igd.eclipse.util.extension,
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF
index bb3d1ab295..a438120396 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy.meta.fragment/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Meta Class Extension Fragment
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy.meta.fragment
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: groovy;bundle-version="2.1.5"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.eclipse.util.extension.simple,
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF
index e99b7ae152..9a12bf6790 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy.sandbox.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Interceptor Test
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy.sandbox.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .
 Require-Bundle: groovy;bundle-version="2.1.5",
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF
index 7eb6a19a27..f5dbb0b33d 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Sandbox
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy.sandbox;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: groovy;bundle-version="2.1.5",
  org.kohsuke.groovy.sandbox;bundle-version="1.5.0"
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/src/eu/esdihumboldt/util/groovy/sandbox/internal/RestrictiveGroovyInterceptor.java b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/src/eu/esdihumboldt/util/groovy/sandbox/internal/RestrictiveGroovyInterceptor.java
index f7c20b1573..29ee65f084 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.sandbox/src/eu/esdihumboldt/util/groovy/sandbox/internal/RestrictiveGroovyInterceptor.java
+++ b/util/plugins/eu.esdihumboldt.util.groovy.sandbox/src/eu/esdihumboldt/util/groovy/sandbox/internal/RestrictiveGroovyInterceptor.java
@@ -22,6 +22,21 @@
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
+import java.time.DayOfWeek;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.Month;
+import java.time.Year;
+import java.time.YearMonth;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.FormatStyle;
+import java.time.format.SignStyle;
+import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -111,6 +126,25 @@ public class RestrictiveGroovyInterceptor extends GroovyInterceptor {
 		allowedClasses.add(Locale.class);
 		// allowedClasses.add(Boolean.class);
 
+		// Java 8 date/time classes
+		allowedClasses.add(DayOfWeek.class);
+		allowedClasses.add(Month.class);
+		allowedClasses.add(Year.class);
+		allowedClasses.add(YearMonth.class);
+		allowedClasses.add(Instant.class);
+
+		allowedClasses.add(LocalDate.class);
+		allowedClasses.add(LocalDateTime.class);
+		allowedClasses.add(LocalTime.class);
+		allowedClasses.add(ZonedDateTime.class);
+		allowedClasses.add(ZoneId.class);
+
+		allowedClasses.add(DateTimeFormatter.class);
+		allowedClasses.add(DateTimeFormatterBuilder.class);
+		allowedClasses.add(FormatStyle.class);
+		allowedClasses.add(TextStyle.class);
+		allowedClasses.add(SignStyle.class);
+
 		// helper classes
 		allowedClasses.add(SimpleDateFormat.class);
 		allowedClasses.add(UUID.class);
diff --git a/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF
index a5675e1ea3..c55a415244 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Utils Tests
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: Data Harmonisation Panel
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
diff --git a/util/plugins/eu.esdihumboldt.util.groovy/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.groovy/META-INF/MANIFEST.MF
index c06ba6ed9a..4c76c3c438 100644
--- a/util/plugins/eu.esdihumboldt.util.groovy/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.groovy/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Groovy Utilities
 Bundle-SymbolicName: eu.esdihumboldt.util.groovy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: eu.esdihumboldt.util.groovy.builder,
  eu.esdihumboldt.util.groovy.collector,
diff --git a/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF
index 98f01e5c79..97dfac78ed 100644
--- a/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.http/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Http Utilities
 Bundle-SymbolicName: eu.esdihumboldt.util.http
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: de.fhg.igd.slf4jplus,
diff --git a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF
index 204da598c6..8f7c044ebb 100644
--- a/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.orient.embedded.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Embedded OrientDB Test Bundle
 Bundle-SymbolicName: eu.esdihumboldt.util.orient.embedded.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.orientechnologies.common;bundle-version="1.5.1",
  com.orientechnologies.orientdb-core;bundle-version="1.5.1"
diff --git a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/.project b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/.project
similarity index 88%
rename from doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/.project
rename to util/plugins/eu.esdihumboldt.util.resource.schemas.end/.project
index 8e1f45679a..1e5a6da170 100644
--- a/doc/plugins/eu.esdihumboldt.hale.doc.xtraserver/.project
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>eu.esdihumboldt.hale.doc.xtraserver</name>
+	<name>eu.esdihumboldt.util.resource.schemas.end</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.end/.settings/org.eclipse.jdt.core.prefs b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..f29e940a00
--- /dev/null
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false
diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.end/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6b6a08cbad
--- /dev/null
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Bundled Environmental Noise Directive (END) Schemas
+Bundle-SymbolicName: eu.esdihumboldt.util.resource.schemas.end;singleton:=true
+Bundle-Version: 4.1.0.qualifier
diff --git a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/build.properties b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/build.properties
similarity index 50%
rename from io/plugins/eu.esdihumboldt.hale.io.xtraserver/build.properties
rename to util/plugins/eu.esdihumboldt.util.resource.schemas.end/build.properties
index e9863e281e..8ad51cb85c 100644
--- a/io/plugins/eu.esdihumboldt.hale.io.xtraserver/build.properties
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/build.properties
@@ -1,5 +1,2 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
-               .,\
                plugin.xml
diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.end/plugin.xml b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/plugin.xml
new file mode 100644
index 0000000000..97b0af2ba7
--- /dev/null
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.end/plugin.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="eu.esdihumboldt.hale.ui.schema.presets">
+      <category
+            id="eu.esdihumboldt.util.resource.schemas.end.category"
+            name="European Noise Directive">
+      </category>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF1_5 Agglomeration Source"
+            id="eu.esdihumboldt.util.resource.schemas.presets.end.df1-5.agg"
+            name="END DF1_5 Agglomeration Source"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF1_5/AgglomerationSource/AgglomerationSource.hsd.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF1_5 Major Airport Source"
+            id="eu.esdihumboldt.util.resource.schemas.end.df1-5.mas"
+            name="END DF1_5 Major Airport Source"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF1_5/MajorAirportSource/MajorAirportSource.hsd.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF1_5 Major Railway Source"
+            id="eu.esdihumboldt.util.resource.schemas.end.schema.df1-5.mrails"
+            name="END DF1_5 Major Railway Source"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF1_5/MajorRailwaySource/MajorRailwaySource.hsd.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF1_5 Major Road Source"
+            id="eu.esdihumboldt.util.resource.schemas.end.schema.df1-5.mroads"
+            name="END DF1_5 Major Road Source"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF1_5/MajorRoadSource/MajorRoadSource.hsd.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF4_8 Agglomerations"
+            id="eu.esdihumboldt.util.resource.schemas.end.df4-8.agg"
+            name="END DF4_8 Agglomerations"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF4_8/Agglomerations/DF4_8-Agglomerations.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF4_8 Major Airports"
+            id="eu.esdihumboldt.util.resource.schemas.end.df4-8.mair"
+            name="END DF4_8 Major Airports"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF4_8/MajorAirports/DF4_8-MajorAirports.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF4_8 Major Railways"
+            id="eu.esdihumboldt.util.resource.schemas.end.df4-8.mrail"
+            name="END DF4_8 Major Railways"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF4_8/MajorRailways/DF4_8-MajorRailways.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF4_8 Major Roads"
+            id="eu.esdihumboldt.util.resource.schemas.end.df4-8.mroads"
+            name="END DF4_8 Major Roads"
+            version="1.0">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF4_8/MajorRoads/DF4_8-MajorRoads.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF7_10 Noise Action Plan Coverage Area"
+            id="eu.esdihumboldt.util.resource.schemas.end.df7-10.nap"
+            name="END DF7_10 Noise Action Plan Coverage Area"
+            version="beta">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF7_10/NoiseActionPlans/NoiseActionPlan-CoverageArea.hsd.json">
+         </uri>
+      </schema>
+      <schema
+            category="eu.esdihumboldt.util.resource.schemas.end.category"
+            description="Geopackage European Noise Directive Application Schema for DF7_10 Quiet Areas"
+            id="eu.esdihumboldt.util.resource.schemas.end.df7-10.qa"
+            name="END DF7_10 Quiet Areas"
+            version="beta">
+         <uri
+               value="https://raw.githubusercontent.com/wetransform-os/geopackage-end/018d8207556dac0f0e4977cbe2a2206cf9094d9c/DF7_10/QuietAreas/QuietAreas.hsd.json">
+         </uri>
+      </schema>
+   </extension>
+
+</plugin>
diff --git a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/META-INF/MANIFEST.MF
index 39d2b924cd..f22cc99834 100644
--- a/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.resource.schemas.inspire.annex1/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bundled Inspire Annex I Schemas
 Bundle-SymbolicName: eu.esdihumboldt.util.resource.schemas.inspire.annex1;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Require-Bundle: eu.esdihumboldt.util.resource.schemas.opengis.net;bundle-version="1.0.0",
  eu.esdihumboldt.util.resource;bundle-version="2.6.0"
diff --git a/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF
index 5e635f39ff..313ad0c9f8 100644
--- a/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.resource/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Resource Utilities
 Bundle-SymbolicName: eu.esdihumboldt.util.resource;singleton:=true
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.collect;version="9.0.0",
  de.fhg.igd.slf4jplus,
diff --git a/util/plugins/eu.esdihumboldt.util.svg.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.svg.test/META-INF/MANIFEST.MF
index 69fe6d7786..7628028b1a 100644
--- a/util/plugins/eu.esdihumboldt.util.svg.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.svg.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Test Utility Bundle with SVG tools
 Bundle-SymbolicName: eu.esdihumboldt.util.svg.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: wetransform GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ClassPath: .,
diff --git a/util/plugins/eu.esdihumboldt.util.test/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util.test/META-INF/MANIFEST.MF
index 25beaca2c4..47617d9b95 100644
--- a/util/plugins/eu.esdihumboldt.util.test/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Utilities Tests
 Bundle-SymbolicName: eu.esdihumboldt.util.test
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Fragment-Host: eu.esdihumboldt.util;bundle-version="2.5.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.junit;version="4.12.0"
diff --git a/util/plugins/eu.esdihumboldt.util/META-INF/MANIFEST.MF b/util/plugins/eu.esdihumboldt.util/META-INF/MANIFEST.MF
index 209d408a48..48177097ca 100644
--- a/util/plugins/eu.esdihumboldt.util/META-INF/MANIFEST.MF
+++ b/util/plugins/eu.esdihumboldt.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Utilities Bundle
 Bundle-SymbolicName: eu.esdihumboldt.util
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: com.google.common.base;version="9.0.0",
  com.google.common.collect;version="9.0.0",