diff --git a/DataExtractionOSM/OsmAndMapCreator.bat b/DataExtractionOSM/OsmAndMapCreator.bat
new file mode 100644
index 0000000000..343746a887
--- /dev/null
+++ b/DataExtractionOSM/OsmAndMapCreator.bat
@@ -0,0 +1,4 @@
+REM the JVM. With the below settings the heap size (Available memory for the application)
+REM will range from 64 megabyte up to 512 megabyte.
+
+start javaw.exe -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx512M -cp "./OsmAndMapCreator.jar;./lib/*.jar" net.osmand.swing.OsmExtractionUI
\ No newline at end of file
diff --git a/DataExtractionOSM/run.sh b/DataExtractionOSM/OsmAndMapCreator.sh
similarity index 59%
rename from DataExtractionOSM/run.sh
rename to DataExtractionOSM/OsmAndMapCreator.sh
index 905050502e..fb12751c58 100644
--- a/DataExtractionOSM/run.sh
+++ b/DataExtractionOSM/OsmAndMapCreator.sh
@@ -4,4 +4,4 @@
 # the JVM. With the below settings the heap size (Available memory for the application)
 # will range from 64 megabyte up to 512 megabyte.
 
-java -jar OsmAndMapCreator.jar -Xms64M -Xmx512M
\ No newline at end of file
+java -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx512M -cp "./OsmAndMapCreator.jar;./lib/*.jar" net.osmand.swing.OsmExtractionUI
\ No newline at end of file
diff --git a/DataExtractionOSM/batch_indexing.bat b/DataExtractionOSM/batch_indexing.bat
new file mode 100644
index 0000000000..e16bd9014f
--- /dev/null
+++ b/DataExtractionOSM/batch_indexing.bat
@@ -0,0 +1,5 @@
+REM the JVM. With the below settings the heap size (Available memory for the application)
+REM will range from 64 megabyte up to 512 megabyte.
+
+
+start java.exe -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx512M -cp "./OsmAndMapCreator.jar;./lib/*.jar" net.osmand.data.index.IndexBatchCreator ./batch.xml
\ No newline at end of file
diff --git a/DataExtractionOSM/batch_indexing.sh b/DataExtractionOSM/batch_indexing.sh
new file mode 100644
index 0000000000..c42458da32
--- /dev/null
+++ b/DataExtractionOSM/batch_indexing.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# This file will start the Osm Extraction UI with custom memory settings for
+# the JVM. With the below settings the heap size (Available memory for the application)
+# will range from 64 megabyte up to 512 megabyte.
+
+java -Djava.util.logging.config.file=logging.properties -Xms64M -Xmx512M -cp "./OsmAndMapCreator.jar;./lib/*.jar" net.osmand.data.index.IndexBatchCreator ./batch.xml
\ No newline at end of file
diff --git a/DataExtractionOSM/build.xml b/DataExtractionOSM/build.xml
index 81113016d0..66fef538dd 100644
--- a/DataExtractionOSM/build.xml
+++ b/DataExtractionOSM/build.xml
@@ -38,8 +38,9 @@
 			<fileset dir=".">
 				<include name="OsmAndMapCreator.jar"/>
 				<include name="lib/**"/>
-				<include name="run.bat"/>
-				<include name="run.sh"/>
+				<include name="logging.properties"/>
+				<include name="OsmAndMapCreator.bat"/>
+				<include name="OsmAndMapCreator.sh"/>
 			</fileset>
 		</copy>
 		<zip destfile="build.zip">
diff --git a/DataExtractionOSM/build.zip b/DataExtractionOSM/build.zip
new file mode 100644
index 0000000000..5492698542
Binary files /dev/null and b/DataExtractionOSM/build.zip differ
diff --git a/DataExtractionOSM/run.bat b/DataExtractionOSM/run.bat
deleted file mode 100644
index 1361d08eac..0000000000
--- a/DataExtractionOSM/run.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-REM the JVM. With the below settings the heap size (Available memory for the application)
-REM will range from 64 megabyte up to 512 megabyte.
-
-start javaw.exe -jar OsmAndMapCreator.jar -Xms64M -Xmx512M
\ No newline at end of file
diff --git a/DataExtractionOSM/src/net/osmand/data/index/batch.xml b/DataExtractionOSM/src/net/osmand/data/index/batch.xml
index 3f16a7dad0..db8e9ee509 100644
--- a/DataExtractionOSM/src/net/osmand/data/index/batch.xml
+++ b/DataExtractionOSM/src/net/osmand/data/index/batch.xml
@@ -20,13 +20,14 @@
 		 or you can upload any file you have to googlecode (just put into 'directory_for_index_files')
 	 -->
 	<process directory_for_osm_files="E:/Information/OSM maps/osm_batch" directory_for_index_files="E:/Information/OSM maps/osm_batch_ind"
-		downloadOsmFiles="true" generateIndexes="true" uploadIndexes="true" deleteFilesAfterUploading="true" indexPOI="true" indexMap="true"
+		downloadOsmFiles="true" generateIndexes="true" uploadIndexes="true"
+		deleteFilesAfterUploading="true" indexPOI="true" indexMap="true"
 		indexTransport="true" indexAddress="true">
 
-
+        <!-- Countries to download from osm server -->
 
 		<!-- EUROPE -->
-		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.bz2" region_prefix="">
+		<regions siteToDownload="http://download.geofabrik.de/osm/europe/{0}.osm.bz2" region_prefix="" skip="true">
 			<region name="albania" esize="6" />
 			<region name="andorra" esize="1" />
 			<region name="austria" esize="110" />
@@ -234,7 +235,7 @@
 		</regions>
 		
 		<!-- USA -->
-		<regions siteToDownload="http://downloads.cloudmade.com/north_america/united_states/{0}/{0}.osm.bz2" region_prefix="Canada_">
+		<regions siteToDownload="http://downloads.cloudmade.com/north_america/united_states/{0}/{0}.osm.bz2" region_prefix="US_">
 			<region name="alabama" esize=""/>
 			<region name="alaska" esize=""/>
 			<region name="arizona" esize=""/>