diff --git a/bootstrap/createDatabase.sh b/bootstrap/createDatabase.sh
index 5239e05127a385c77ef2e97f28348273f32a9ae2..4d87bd31af0aca936685e6fb66cd1e3db9c47fe1 100755
--- a/bootstrap/createDatabase.sh
+++ b/bootstrap/createDatabase.sh
@@ -43,7 +43,7 @@ cd $WORKING_DIR
 
 if $AVAILABLE_POSTGRES; then
 	echo "Creating postgresql database \"$PG_DB_NAME\""
-	sudo -u "postgres" ${EXEC_POSTGRES} -d template1 -c "CREATE DATABASE \"$PG_DB_NAME\";" >> $WORKING_DIR/setup_database.log 2>&1
+	sudo -u "postgres" ${EXEC_POSTGRES} -d "template1" -c "CREATE DATABASE \"$PG_DB_NAME\";" >> $WORKING_DIR/setup_database.log 2>&1
 	sudo -u "postgres" ${EXEC_POSTGRES} -d "$PG_DB_NAME" -c "CREATE USER \"$PG_DB_USER\" WITH PASSWORD '$PG_DB_PASSWORD';" >> $WORKING_DIR/setup_database.log 2>&1
 	sudo -u "postgres" ${EXEC_POSTGRES} -d "$PG_DB_NAME" -c "ALTER DATABASE \"$PG_DB_NAME\" OWNER TO \"$PG_DB_USER\";" >> $WORKING_DIR/setup_database.log 2>&1
 	sudo -u "postgres" ${EXEC_POSTGRES} -d "$PG_DB_NAME" -c "GRANT ALL PRIVILEGES ON DATABASE \"$PG_DB_NAME\" TO \"$PG_DB_USER\";" >> $WORKING_DIR/setup_database.log 2>&1
@@ -65,7 +65,10 @@ if $AVAILABLE_POSTGRES; then
 
 	if $AVAILABLE_ISOCHRONE_DATAMODEL; then
 		echo "Initializing database schema for isochrone-datamodel (used for testing, ...)"
-		DB_USERNAME="$PG_DB_USER" DB_PASSWORD="$PG_DB_PASSWORD" java -jar "${DEPLOY_DIR}/isochrone-datamodel.jar" -d
+		unzip -p "${DEPLOY_DIR}/isochrone-datamodel.jar" at/uibk/dbis/isochrone/datamodel/db/db_create.sql | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "template1" >> $WORKING_DIR/setup_database.log 2>&1
+		unzip -p "${DEPLOY_DIR}/isochrone-datamodel.jar" at/uibk/dbis/isochrone/datamodel/db/schema_drop.sql | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "spatial" >> $WORKING_DIR/setup_database.log 2>&1
+		unzip -p "${DEPLOY_DIR}/isochrone-datamodel.jar" at/uibk/dbis/isochrone/datamodel/db/schema_create.sql | PGPASSWORD="spatial" psql -U "spatial" -h localhost -d "spatial" >> $WORKING_DIR/setup_database.log 2>&1
+		unzip -p "${DEPLOY_DIR}/isochrone-datamodel.jar" at/uibk/dbis/isochrone/datamodel/db/extension_create.sql | PGPASSWORD="$PG_DB_PASSWORD" psql -U "$PG_DB_USER" -h localhost -d "spatial" >> $WORKING_DIR/setup_database.log 2>&1
 	fi
 fi
 
diff --git a/bootstrap/importData.sh b/bootstrap/importData.sh
index bec2643f2f4f530cb36e6093cfd966bdba480d37..510fc77d65922d03188897a5eaa23676a2cf1770 100755
--- a/bootstrap/importData.sh
+++ b/bootstrap/importData.sh
@@ -181,7 +181,7 @@ fn_import_data "San Francisco" "$OSM_FILE_CALIFORNIA" "$OSM_FILE_SF_FILTERED" "$
 #fi
 
 # Generate synthetic datasets
-if $AVAILABLE_POSTGIS && $INSTALL_ISOCHRONE_TOOLS; then
+if $AVAILABLE_POSTGIS && $AVAILABLE_ISOCHRONE_TOOLS; then
 	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.GridNetworkGenerator -d 100 -l 60 > "$WORKING_DIR/generate_gridNetwork.log" 2>&1
 	java -cp $DOWNLOAD_DIR/isochrone-tools.jar at.uibk.dbis.isochrone.generator.SpiderNetworkGenerator -d 6 -lvl 1000 -l 60 > "$WORKING_DIR/generate_spiderNetwork.log" 2>&1
 fi
diff --git a/bootstrap/prepareEnvironment.sh b/bootstrap/prepareEnvironment.sh
index 23018da10ed12636f8c33535fa80266a5875609b..577401367fdf478cfd3d8b691c03158b205421fc 100755
--- a/bootstrap/prepareEnvironment.sh
+++ b/bootstrap/prepareEnvironment.sh
@@ -383,7 +383,8 @@ if $IMPORT_SCHEDULES; then echo "Importing schedules"; fi
 if $INSTALL_ISOCHRONE_LOCAL; then echo "Importing project \"isochrone (local testing)\""; fi
 if $INSTALL_ISOCHRONE_RELEASE; then echo "Importing project \"isochrone (release)\""; fi
 if $INSTALL_ISOCHRONE_SNAPSHOT; then echo "Importing project \"isochrone (testing)\""; fi
-if $INSTALL_ISOCHTONE_TOOLS; then echo "Importing project \"isochrone-tools\""; fi
+if $INSTALL_ISOCHRONE_DATAMODEL; then echo "Importing project \"isochrone-datamodel\""; fi
+if $INSTALL_ISOCHRONE_TOOLS; then echo "Importing project \"isochrone-tools\""; fi
 if $INSTALL_PROJECT_PSIPROBE; then echo "Importing project \"psi-probe\""; fi
 echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo " Performing installations ($(date +%H:%M:%S)):"
@@ -567,17 +568,19 @@ if $INSTALL_ISOCHRONE_SNAPSHOT; then
 fi
 
 if $INSTALL_ISOCHRONE_DATAMODEL; then
-	echo "Installing \"isochrone-datamodel\""
+	echo "Installing \"$NEXUS_ARTIFACT_NAME_DATAMODEL\""
 	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL"
 
-	fn_download $DOWNLOAD_DIR/isochrone-datamodel.jar $NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL
+	fn_download $DOWNLOAD_DIR/$NEXUS_ARTIFACT_NAME_DATAMODEL.jar $NEXUS_SNAPSHOT_ISOCHRONE_DATAMODEL
+	cp $DOWNLOAD_DIR/$INSTALL_ISOCHRONE_DATAMODEL.jar $DEPLOY_DIR/
 fi
 
 if $INSTALL_ISOCHRONE_TOOLS; then
-	echo "Installing \"isochrone-tools\""
+	echo "Installing \"$NEXUS_ARTIFACT_NAME_TOOLS\""
 	echo "  - artifact: $NEXUS_SNAPSHOT_ISOCHRONE_TOOLS"
 
-	fn_download $DOWNLOAD_DIR/isochrone-tools.jar $NEXUS_SNAPSHOT_ISOCHRONE_TOOLS
+	fn_download $DOWNLOAD_DIR/$NEXUS_ARTIFACT_NAME_TOOLS.jar $NEXUS_SNAPSHOT_ISOCHRONE_TOOLS
+	cp $DOWNLOAD_DIR/$NEXUS_ARTIFACT_NAME_TOOLS.jar $DEPLOY_DIR/
 fi
 
 if $INSTALL_PROJECT_PSIPROBE; then