diff --git a/.gitignore b/.gitignore
index aa724b7..146151d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,15 @@
 *.iml
 .gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+.idea
 .DS_Store
-/build
-/captures
+build
+captures
 .externalNativeBuild
 .cxx
 local.properties
+xcuserdata
+.kotlin
+/publish-and-release.sh
+/snapshot.sh
+/publish-only.sh
+/local-build.sh
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fcb19bf 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="18" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 34e4d3b..0d6db45 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,15 +4,13 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/dotmimsync" />
+            <option value="$PROJECT_DIR$/dotmimsync-core" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/LICENSE b/LICENSE
index 78ca603..b15e087 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Alexey Starchikov
+Copyright (c) 2021 Aleksei Starchikov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
\ No newline at end of file
diff --git a/README.md b/README.md
index 9a57757..b3f8c4e 100644
--- a/README.md
+++ b/README.md
@@ -3,31 +3,47 @@
 [![Release](https://jitpack.io/v/vunder/dotmimsync.svg)](https://jitpack.io/vunder/dotmimsync)
 [![](https://jitci.com/gh/vunder/dotmimsync/svg)](https://jitci.com/gh/vunder/dotmimsync)
 
-Android (Kotlin) port for [Dotmim.Sync](https://github.com/Mimetis/Dotmim.Sync) C# library. Original library documentation can be found [here](https://dotmimsync.readthedocs.io/)
+Kotlin Multiplatform port for [Dotmim.Sync](https://github.com/Mimetis/Dotmim.Sync) C# library. Original library documentation can be found [here](https://dotmimsync.readthedocs.io/)
 
 
 ## Adding dependencies
 To use library in your app add link to JitPack repo
 
-```
+```gradle
     allprojects {
         repositories {
             ...
-            maven { url 'https://jitpack.io' }
+            mavenCentral()
         }
     }
 ```
 and add library dependency to your app build.gradle
-```
+```gradle
     dependencies {
-            implementation 'com.github.vunder:dotmimsync:VERSION'
+        implementation 'io.github.vunder.dotmimsync:dotmimsync-core:VERSION'
     }
 ```
 
-Also it is necessary to add this dependency to make library work correctly with http-session. You can use newer version in case it is available
-```
-    dependencies {
-            implementation 'com.squareup.okhttp3:okhttp-urlconnection:5.0.0-alpha.2'
+```kotlin
+    BundledSQLiteDriver().open(databaseFullPath).use { sqliteConnection ->
+        val syncSetup = SyncSetup() // fill sync tables info
+        val serverOrchestrator = WebClientOrchestrator(
+            "http://your-server-api",
+            httpClient, // injected on created Ktor HttpClient instance
+            authHeader // server authentication header, e.g. "Bearer <token>"
+        )
+        val clientProvider = SqliteSyncProvider(sqliteConnection)
+        val syncOptions = SyncOptions(useVerboseErrors = true)
+        val agent = SyncAgent(clientProvider, serverOrchestrator, syncOptions, syncSetup)
+        val progress = object : Progress<ProgressArgs> {
+            override fun report(value: ProgressArgs) {
+                Log.d(
+                    "sync-progress",
+                    "LOCAL[${value.eventId}]. ${value.context.syncStage}: ${value.message} ${value.progressPercentage * 100}% (${value.hint})(${value.context.sessionId})"
+                )
+            }
+        }
+        val syncResult = agent.synchronize(progress = progress)
     }
 ```
 
@@ -38,6 +54,8 @@ General use-cases you can find in original library documentation
 
 ## Dotmim.Sync version match table
 Here is a version match table. Left column represent current library, right column - Dotmim.Sync library
-|Library version|Dotmim.Sync version|
-|-|-|
-|1.0-1.0.2|0.9.1 or lower|
+
+| Library version |Dotmim.Sync version|
+|----------------|-|
+| 1.0-1.1.0      |0.9.1 or lower|
+| 1.1.0          |0.9.1 or lower|
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 860a5c4..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-}
-
-android {
-    compileSdk rootProject.ext.compileSdk
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        applicationId "com.mimetis.dotmimsync"
-        minSdk rootProject.ext.minSdk
-        targetSdk rootProject.ext.targetSdk
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
-    testImplementation 'junit:junit:4.+'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/app/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt
deleted file mode 100644
index 77914fd..0000000
--- a/app/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mimetis.dotmimsync
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.mimetis.dotmimsync", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
deleted file mode 100644
index e44222f..0000000
--- a/app/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mimetis.dotmimsync">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Dotmimsync">
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/mimetis/dotmimsync/MainActivity.kt b/app/src/main/java/com/mimetis/dotmimsync/MainActivity.kt
deleted file mode 100644
index 137740b..0000000
--- a/app/src/main/java/com/mimetis/dotmimsync/MainActivity.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.mimetis.dotmimsync
-
-import androidx.appcompat.app.AppCompatActivity
-import android.os.Bundle
-
-class MainActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 4fc2444..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d..0000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d6..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611d..0000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a307..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a695..0000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f50..0000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d642..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae3..0000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 93ece03..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Dotmimsync" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127..0000000
--- a/app/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
deleted file mode 100644
index d2974f1..0000000
--- a/app/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">dotmimsync</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 9ed01fd..0000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Dotmimsync" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt b/app/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt
deleted file mode 100644
index 94e406f..0000000
--- a/app/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mimetis.dotmimsync
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 1d5ac1c..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,36 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    ext {
-        buildToolsVersion = "30.0.3"
-        compileSdk = 31
-        minSdk = 21
-        targetSdk = 31
-        libraryVersion = "1.0.10"
-    }
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:1.6.0"
-        classpath "com.github.dcendents:android-maven-gradle-plugin:2.1"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..12d80f7
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,5 @@
+plugins {
+    //trick: for the same plugin versions in all sub-modules
+    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.kotlinMultiplatform).apply(false)
+}
diff --git a/dotmimsync-core/build.gradle.kts b/dotmimsync-core/build.gradle.kts
new file mode 100644
index 0000000..cf78560
--- /dev/null
+++ b/dotmimsync-core/build.gradle.kts
@@ -0,0 +1,150 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.jetbrains.kotlin.serialization)
+    `maven-publish`
+    alias(libs.plugins.vanniktech.maven.publish)
+}
+
+kotlin {
+    jvm()
+
+    androidTarget {
+        publishLibraryVariants("release")
+        withSourcesJar(publish = true)
+
+        compilations.all {
+            compileTaskProvider.configure {
+                compilerOptions {
+                    jvmTarget.set(JvmTarget.JVM_18)
+                }
+            }
+        }
+    }
+    
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            baseName = "shared"
+            isStatic = true
+        }
+    }
+
+    sourceSets {
+        commonMain.dependencies {
+            implementation(libs.jetbrains.serialization.core)
+            implementation(libs.jetbrains.serialization.json)
+            implementation(libs.kotlinx.datetime)
+            implementation(libs.androidx.sqlite.bundled)
+
+            implementation(libs.ktor.client.core)
+
+            implementation(libs.kotlin.bignum)
+            implementation(libs.kotlin.bignum.serialization)
+            implementation(kotlincrypto.hash.sha2)
+        }
+        commonTest.dependencies {
+            implementation(libs.kotlin.test)
+        }
+    }
+}
+
+android {
+    namespace = "com.mimetis.dotmimsync"
+    compileSdk = 36
+    defaultConfig {
+        minSdk = 26
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_18
+        targetCompatibility = JavaVersion.VERSION_18
+    }
+
+    buildTypes {
+        debug {  }
+        release {  }
+    }
+
+    publishing {
+        singleVariant("release") {
+            withSourcesJar()
+            withJavadocJar()
+        }
+    }
+}
+
+val libVersion = "1.1.1-beta9"
+val versionSuffix: String by project
+
+publishing.publications
+    .withType<MavenPublication>()
+    .configureEach {
+        groupId = "io.github.vunder.dotmimsync"
+        version = libVersion
+        if (versionSuffix.isNotBlank()) {
+            version += "-$versionSuffix"
+        }
+
+        pom {
+            name = "dotmimsync"
+            description = "Android (Kotlin) port for Dotmim.Sync C# library (https://dotmimsync.readthedocs.io/)"
+            url = "https://github.com/vunder/dotmimsync"
+
+            licenses {
+                license {
+                    name = "MIT License"
+                    url = "https://mit-license.org/"
+                    distribution = "https://mit-license.org/"
+                }
+            }
+
+            developers {
+                developer {
+                    id = "vunder"
+                    name = "Aleksei Starchikov"
+                    email = "aleksei.starchikov@outlook.com"
+                }
+            }
+
+            issueManagement {
+                system = "GitHub"
+                url = "https://github.com/vunder/dotmimsync/issues"
+            }
+
+            scm {
+                url = "https://github.com/vunder/dotmimsync"
+            }
+        }
+    }
+
+publishing {
+    repositories {
+//        mavenLocal()
+
+        maven {
+            name = "BuildDir"
+            url = uri(rootProject.layout.buildDirectory.dir("maven-repo"))
+        }
+
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/vunder/dotmimsync")
+            credentials {
+                username = ""
+                password = ""
+            }
+        }
+    }
+}
+
+mavenPublishing {
+    coordinates("io.github.vunder.dotmimsync", "dotmimsync-core", libVersion)
+
+    publishToMavenCentral(automaticRelease = false)
+    signAllPublications()
+}
\ No newline at end of file
diff --git a/dotmimsync-core/src/androidMain/kotlin/com/mimetis/dotmimsync/Platform.android.kt b/dotmimsync-core/src/androidMain/kotlin/com/mimetis/dotmimsync/Platform.android.kt
new file mode 100644
index 0000000..2638faf
--- /dev/null
+++ b/dotmimsync-core/src/androidMain/kotlin/com/mimetis/dotmimsync/Platform.android.kt
@@ -0,0 +1,7 @@
+package com.mimetis.dotmimsync
+
+class AndroidPlatform : Platform {
+    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
+}
+
+actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt
new file mode 100644
index 0000000..4d63c88
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt
@@ -0,0 +1,49 @@
+package com.mimetis.dotmim.sync
+
+import com.mimetis.dotmim.sync.set.CustomList
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.encoding.Encoder
+
+abstract class ArrayListLikeSerializer<T, R>(protected val elementSerializer: KSerializer<R>) : KSerializer<T>
+        where T : CustomList<R> {
+//    override val descriptor: SerialDescriptor = listSerialDescriptor<R>()
+
+    override fun serialize(encoder: Encoder, value: T) {
+        val size = value.size
+        val composite = encoder.beginCollection(descriptor, size)
+        for (index in 0 until size)
+            composite.encodeSerializableElement(elementSerializer.descriptor, index, elementSerializer, value[index])
+        composite.endStructure(descriptor)
+    }
+
+//    inline fun<reified X > foo(): KSerializer<R> {
+//        return serializer<X>() as KSerializer<R>
+//    }
+
+//    override fun deserialize(decoder: Decoder): T {
+//        val items = ArrayList<R>()
+//        ((this.javaClass
+//                .genericSuperclass as ParameterizedType)
+//                .actualTypeArguments[0] as Class<T>).constructors.elementAt(0).newInstance() as T
+//
+//        val compositeDecoder = decoder.beginStructure(descriptor)
+//
+//        if (compositeDecoder.decodeSequentially()) {
+//            val size = compositeDecoder.decodeCollectionSize(descriptor)
+//            for (i in 0 until size) {
+//                val element = compositeDecoder.decodeSerializableElement(elementSerializer.descriptor, i, elementSerializer)
+//                items.add(element)
+//            }
+//        } else {
+//            while (true) {
+//                val index = compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+//                if (index == CompositeDecoder.DECODE_DONE) break
+//                val element = compositeDecoder.decodeSerializableElement(elementSerializer.descriptor, index, elementSerializer)
+//                items.add(element)
+//            }
+//        }
+//        compositeDecoder.endStructure(descriptor)
+//
+//        return parameters
+//    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/CoreProvider.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/CoreProvider.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/CoreProvider.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/CoreProvider.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DataRowState.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DataRowState.kt
new file mode 100644
index 0000000..df41bf1
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DataRowState.kt
@@ -0,0 +1,32 @@
+package com.mimetis.dotmim.sync
+
+import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+class DataRowStateSerializer : KSerializer<DataRowState> {
+    private var values: Map<Int, DataRowState>? = null
+
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.DataRowState", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: DataRowState) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): DataRowState =
+        (values
+            ?: DataRowState .entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
+
+@Serializable(with = DataRowStateSerializer::class)
+enum class DataRowState(override val value: Int) : EnumWithValue {
+    Detached(1),
+    Unchanged(2),
+    Added(4),
+    Deleted(8),
+    Modified(16)
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DbSyncAdapter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DbSyncAdapter.kt
similarity index 81%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/DbSyncAdapter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DbSyncAdapter.kt
index 75beb71..c192db3 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DbSyncAdapter.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/DbSyncAdapter.kt
@@ -1,28 +1,29 @@
 package com.mimetis.dotmim.sync
 
-import android.database.Cursor
+import androidx.sqlite.SQLiteStatement
 import com.mimetis.dotmim.sync.set.SyncRow
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.set.SyncTable
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.io.Closeable
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 abstract class DbSyncAdapter(
     val tableDescription: SyncTable,
     val setup: SyncSetup
-) : Closeable {
-    abstract fun getSelectInitializedChangesWithFilters(): Cursor
-    abstract fun getSelectInitializedChanges(): Cursor
-    abstract fun getSelectChangesWithFilters(lastTimestamp: Long?): Cursor
-    abstract fun getSelectChanges(lastTimestamp: Long?): Cursor
-    abstract fun getSelectRow(primaryKeyRow: SyncRow): Cursor
+) : AutoCloseable {
+    abstract fun getSelectInitializedChangesWithFilters(): SQLiteStatement
+    abstract fun getSelectInitializedChanges(): SQLiteStatement
+    abstract fun getSelectChangesWithFilters(lastTimestamp: Long?): SQLiteStatement
+    abstract fun getSelectChanges(lastTimestamp: Long?): SQLiteStatement
+    abstract fun getSelectRow(primaryKeyRow: SyncRow): SQLiteStatement
 
     abstract fun enableConstraints()
     abstract fun disableConstraints()
     abstract fun reset()
     abstract fun deleteRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -30,7 +31,7 @@ abstract class DbSyncAdapter(
     ): Int
 
     abstract fun initializeRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -38,7 +39,7 @@ abstract class DbSyncAdapter(
     ): Int
 
     abstract fun updateRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -46,7 +47,7 @@ abstract class DbSyncAdapter(
     ): Int
 
     abstract fun updateMetadata(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         isDeleted: Boolean,
         forceWrite: Boolean,
         row: SyncRow
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Extensions.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Extensions.kt
new file mode 100644
index 0000000..67b7914
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Extensions.kt
@@ -0,0 +1,7 @@
+package com.mimetis.dotmim.sync
+
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+
+@OptIn(ExperimentalTime::class)
+fun utcNow(): Long = Clock.System.now().toEpochMilliseconds()
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingClientScopeInfoException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingClientScopeInfoException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingClientScopeInfoException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingClientScopeInfoException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingColumnException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingColumnException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingColumnException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingColumnException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingFileException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingFileException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingFileException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingFileException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingLocalOrchestratorSchemaException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingLocalOrchestratorSchemaException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingLocalOrchestratorSchemaException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingLocalOrchestratorSchemaException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingPrimaryKeyColumnException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingPrimaryKeyColumnException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingPrimaryKeyColumnException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingPrimaryKeyColumnException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingPrimaryKeyException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingPrimaryKeyException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingPrimaryKeyException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingPrimaryKeyException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTableException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTableException.kt
similarity index 82%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTableException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTableException.kt
index f23e865..4853eff 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTableException.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTableException.kt
@@ -1,6 +1,4 @@
 package com.mimetis.dotmim.sync
 
-import java.lang.Exception
-
 class MissingTableException(tableName: String) : Exception("Table $tableName does not exists") {
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTablesException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTablesException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTablesException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTablesException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTrackingTableException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTrackingTableException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingTrackingTableException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingTrackingTableException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingsColumnException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingsColumnException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/MissingsColumnException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/MissingsColumnException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/OutOfDateException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/OutOfDateException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/OutOfDateException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/OutOfDateException.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Platform.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Platform.kt
new file mode 100644
index 0000000..cab21e1
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Platform.kt
@@ -0,0 +1,16 @@
+package com.mimetis.dotmimsync
+
+interface Platform {
+    val name: String
+}
+
+expect fun getPlatform(): Platform
+
+private var platform: Platform? = null
+
+val currentPlatform: Platform
+    get() {
+        if (platform == null)
+            platform = getPlatform()
+        return platform!!
+    }
\ No newline at end of file
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/PrimitiveSerializer.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/PrimitiveSerializer.kt
similarity index 57%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/PrimitiveSerializer.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/PrimitiveSerializer.kt
index c957d6f..e8e3cff 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/PrimitiveSerializer.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/PrimitiveSerializer.kt
@@ -1,7 +1,9 @@
 package com.mimetis.dotmim.sync
 
-import android.annotation.SuppressLint
-import android.util.Base64
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.format
+import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.byUnicodePattern
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.KSerializer
@@ -10,22 +12,37 @@ import kotlinx.serialization.descriptors.SerialDescriptor
 import kotlinx.serialization.descriptors.buildSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.json.*
-import java.text.SimpleDateFormat
-import java.util.*
+import kotlinx.serialization.json.JsonDecoder
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.boolean
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.double
+import kotlinx.serialization.json.doubleOrNull
+import kotlinx.serialization.json.float
+import kotlinx.serialization.json.floatOrNull
+import kotlinx.serialization.json.int
+import kotlinx.serialization.json.intOrNull
+import kotlinx.serialization.json.jsonPrimitive
+import kotlinx.serialization.json.long
+import kotlinx.serialization.json.longOrNull
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(
+    ExperimentalUuidApi::class,
+    FormatStringsInDatetimeFormats::class,
+    ExperimentalEncodingApi::class
+)
 @ExperimentalSerializationApi
 object PrimitiveSerializer : KSerializer<Any> {
-    private const val dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
-
-    private val gmtTimeZone = TimeZone.getTimeZone("GMT")
-
-    @SuppressLint("SimpleDateFormat")
-    private val simpleDateFormat = SimpleDateFormat(dateFormat).apply { timeZone = gmtTimeZone }
+    private val dateFormat = LocalDateTime.Format { byUnicodePattern("yyyy-MM-dd'T'HH:mm:ss") }
+//    private const val dateFormat = "yyyy-MM-dd'T'HH:mm:ss"
 
     @OptIn(InternalSerializationApi::class)
     override val descriptor: SerialDescriptor =
-        buildSerialDescriptor("PrimitiveSerializer", PolymorphicKind.SEALED)
+        buildSerialDescriptor("com.mimetis.dotmim.sync.PrimitiveSerializer", PolymorphicKind.SEALED)
 
     override fun serialize(encoder: Encoder, value: Any) {
         when (value) {
@@ -35,9 +52,9 @@ object PrimitiveSerializer : KSerializer<Any> {
             is Long -> encoder.encodeLong(value)
             is Double -> encoder.encodeDouble(value)
             is Float -> encoder.encodeFloat(value)
-            is ByteArray -> encoder.encodeString(Base64.encodeToString(value, Base64.NO_WRAP))
-            is UUID -> encoder.encodeString(value.toString().uppercase())
-            is Date -> encoder.encodeString(simpleDateFormat.format(value))
+            is ByteArray -> encoder.encodeString(Base64.encode(value))
+            is Uuid -> encoder.encodeString(value.toString().uppercase())
+            is LocalDateTime -> encoder.encodeString(value.format(dateFormat))
             else -> encoder.encodeString(value.toString())
         }
     }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/Progress.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Progress.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/Progress.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Progress.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/RollbackException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/RollbackException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/RollbackException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/RollbackException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/RowOverSizedException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/RowOverSizedException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/RowOverSizedException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/RowOverSizedException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncAgent.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncAgent.kt
similarity index 72%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncAgent.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncAgent.kt
index 4c205a2..6184936 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncAgent.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncAgent.kt
@@ -1,6 +1,5 @@
 package com.mimetis.dotmim.sync
 
-import android.util.Log
 import com.mimetis.dotmim.sync.args.ProgressArgs
 import com.mimetis.dotmim.sync.enumerations.ConflictResolutionPolicy
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
@@ -11,35 +10,41 @@ import com.mimetis.dotmim.sync.parameter.SyncParameters
 import com.mimetis.dotmim.sync.scopes.ServerScopeInfo
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 class SyncAgent(
-        clientProvider: CoreProvider,
-        val remoteOrchestrator: RemoteOrchestrator,
-        val options: SyncOptions,
-        val setup: SyncSetup,
-        private val scopeName: String = SyncOptions.DefaultScopeName
+    clientProvider: CoreProvider,
+    val remoteOrchestrator: RemoteOrchestrator,
+    val options: SyncOptions,
+    val setup: SyncSetup,
+    private val scopeName: String = SyncOptions.DefaultScopeName
 ) {
-    val localOrchestrator: LocalOrchestrator = LocalOrchestrator(clientProvider, options, setup, scopeName)
+    val localOrchestrator: LocalOrchestrator =
+        LocalOrchestrator(clientProvider, options, setup, scopeName)
     private lateinit var schema: SyncSet
     val parameters: SyncParameters = SyncParameters()
 
-    suspend fun synchronize(syncType: SyncType = SyncType.Normal, progress: Progress<ProgressArgs>? = null): SyncResult {
+    suspend fun synchronize(
+        syncType: SyncType = SyncType.Normal,
+        progress: Progress<ProgressArgs>? = null
+    ): SyncResult {
         val startTime = utcNow()
         var completeTime = utcNow()
 
         val context = SyncContext(
-                sessionId = UUID.randomUUID(),
-                scopeName = this.scopeName,
-                parameters = this.parameters,
-                syncType = syncType
+            sessionId = Uuid.random(),
+            scopeName = this.scopeName,
+            parameters = this.parameters,
+            syncType = syncType
         )
 
         // Result, with sync results stats.
         val result = SyncResult(
-                context.sessionId,
-                startTime,
-                completeTime,
+            context.sessionId,
+            startTime,
+            completeTime,
         )
 
         try {
@@ -72,8 +77,19 @@ class SyncAgent(
                     this.localOrchestrator.setup = serverScopeInfo.setup
 
                 // Provision local database
-                val provision = EnumSet.of(SyncProvision.Table, SyncProvision.TrackingTable, SyncProvision.StoredProcedures, SyncProvision.Triggers)
-                this.localOrchestrator.provision(serverScopeInfo.schema!!, provision, false, clientScopeInfo, progress)
+                val provision = HashSet<SyncProvision>().apply {
+                    add(SyncProvision.Table)
+                    add(SyncProvision.TrackingTable)
+                    add(SyncProvision.StoredProcedures)
+                    add(SyncProvision.Triggers)
+                }
+                this.localOrchestrator.provision(
+                    serverScopeInfo.schema!!,
+                    provision,
+                    false,
+                    clientScopeInfo,
+                    progress
+                )
 
                 // Set schema for agent, just to let the opportunity to user to use it.
                 this.schema = serverScopeInfo.schema!!
@@ -94,7 +110,8 @@ class SyncAgent(
                 val hasSameOptions = clientScopeInfo.setup!!.hasSameOptions(this.setup)
 
                 // compare local setup strucutre with remote structure
-                val hasSameStructure = clientScopeInfo.setup!!.hasSameStructure(serverScopeInfo.setup)
+                val hasSameStructure =
+                    clientScopeInfo.setup!!.hasSameStructure(serverScopeInfo.setup)
 
                 if (hasSameStructure) {
                     // Sett schema & setup
@@ -118,7 +135,11 @@ class SyncAgent(
 
                 // If one of the comparison is false, we make a migration
                 if (!hasSameOptions || !hasSameStructure) {
-                    this.localOrchestrator.migration(clientScopeInfo.setup!!, serverScopeInfo.schema!!, progress)
+                    this.localOrchestrator.migration(
+                        clientScopeInfo.setup!!,
+                        serverScopeInfo.schema!!,
+                        progress
+                    )
                     clientScopeInfo.setup = this.setup
                     clientScopeInfo.schema = serverScopeInfo.schema
                 }
@@ -135,7 +156,7 @@ class SyncAgent(
                 // if client does not change SyncType to Reinitialize / ReinitializeWithUpload on SyncInterceptor, we raise an error
                 // otherwise, we are outdated, but we can continue, because we have a new mode.
                 if (isOutDated)
-                    Log.w(TAG, "Client id outdated, but we change mode to ${context.syncType}")
+                    println("[$TAG]: Client id outdated, but we change mode to ${context.syncType}")
             }
 
             context.progressPercentage = 0.1
@@ -148,16 +169,25 @@ class SyncAgent(
                 clientScopeInfo.lastServerSyncTimestamp = null
 
             // Get if we need to get all rows from the datasource
-            val fromScratch = clientScopeInfo.isNewScope || context.syncType == SyncType.Reinitialize || context.syncType == SyncType.ReinitializeWithUpload
+            val fromScratch =
+                clientScopeInfo.isNewScope || context.syncType == SyncType.Reinitialize || context.syncType == SyncType.ReinitializeWithUpload
 
             // IF is new and we have a snapshot directory, try to apply a snapshot
             if (fromScratch) {
                 // Get snapshot files
-                val serverSnapshotChanges = this.remoteOrchestrator.getSnapshot(this.schema, progress)
+                val serverSnapshotChanges =
+                    this.remoteOrchestrator.getSnapshot(this.schema, progress)
 
                 // Apply snapshot
                 if (serverSnapshotChanges.second != null) {
-                    val (snapshotChangesAppliedOnClient, clientSI) = this.localOrchestrator.applySnapshot(clientScopeInfo, serverSnapshotChanges.second, clientChanges.first, serverSnapshotChanges.first, serverSnapshotChanges.third, progress)
+                    val (snapshotChangesAppliedOnClient, clientSI) = this.localOrchestrator.applySnapshot(
+                        clientScopeInfo,
+                        serverSnapshotChanges.second,
+                        clientChanges.first,
+                        serverSnapshotChanges.first,
+                        serverSnapshotChanges.third,
+                        progress
+                    )
                     result.snapshotChangesAppliedOnClient = snapshotChangesAppliedOnClient
                     clientScopeInfo = clientSI
                 }
@@ -165,10 +195,15 @@ class SyncAgent(
 
             context.progressPercentage = 0.3
             // apply is 25%, get changes is 20%
-            val serverChanges = this.remoteOrchestrator.applyThenGetChanges(clientScopeInfo, clientChanges.second, progress)
+            val serverChanges = this.remoteOrchestrator.applyThenGetChanges(
+                clientScopeInfo,
+                clientChanges.second,
+                progress
+            )
 
             // Policy is always Server policy, so reverse this policy to get the client policy
-            val reverseConflictResolutionPolicy = if (serverChanges.value3 == ConflictResolutionPolicy.ServerWins) ConflictResolutionPolicy.ClientWins else ConflictResolutionPolicy.ServerWins
+            val reverseConflictResolutionPolicy =
+                if (serverChanges.value3 == ConflictResolutionPolicy.ServerWins) ConflictResolutionPolicy.ClientWins else ConflictResolutionPolicy.ServerWins
 
             // Get if we have already applied a snapshot, so far we don't need to reset table even if we are i Reinitialize Mode
             val snapshotApplied = result.snapshotChangesAppliedOnClient != null
@@ -176,9 +211,16 @@ class SyncAgent(
             // apply is 25%
             context.progressPercentage = 0.75
             val clientChangesApplied = this.localOrchestrator.applyChanges(
-                    clientScopeInfo, this.schema, serverChanges.value2,
-                    clientChanges.first, serverChanges.value1, reverseConflictResolutionPolicy, snapshotApplied,
-                    serverChanges.value5!!, progress)
+                clientScopeInfo,
+                this.schema,
+                serverChanges.value2,
+                clientChanges.first,
+                serverChanges.value1,
+                reverseConflictResolutionPolicy,
+                snapshotApplied,
+                serverChanges.value5!!,
+                progress
+            )
 
             completeTime = utcNow()
             this.localOrchestrator.completeTime = completeTime
@@ -213,6 +255,6 @@ class SyncAgent(
     }
 
     companion object {
-        private val TAG = SyncAgent::class.java.simpleName
+        private val TAG = SyncAgent::class.simpleName
     }
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncConflict.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncConflict.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncConflict.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncConflict.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncContext.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncContext.kt
similarity index 77%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncContext.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncContext.kt
index 40042de..78916c4 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncContext.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncContext.kt
@@ -1,34 +1,36 @@
 package com.mimetis.dotmim.sync
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import com.mimetis.dotmim.sync.enumerations.SyncStage
 import com.mimetis.dotmim.sync.enumerations.SyncType
 import com.mimetis.dotmim.sync.enumerations.SyncWay
 import com.mimetis.dotmim.sync.parameter.SyncParameters
-import java.util.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 @Serializable
 class SyncContext(
     @SerialName("id")
-    @Serializable(with = UUIDSerializer::class)
-    var sessionId: UUID,
+    @Serializable(with = UuidSerializer::class)
+    var sessionId: Uuid,
 
     @SerialName("sn")
     var scopeName: String,
 
     @SerialName("csid")
-    @Serializable(with = UUIDSerializer::class)
-    var clientScopeId: UUID? = null,
+    @Serializable(with = UuidSerializer::class)
+    var clientScopeId: Uuid? = null,
 
     @SerialName("typ")
-    var syncType: SyncType = SyncType.values()[0],
+    var syncType: SyncType = SyncType.entries[0],
 
     @SerialName("way")
-    var syncWay: SyncWay = SyncWay.values()[0],
+    var syncWay: SyncWay = SyncWay.entries[0],
 
     @SerialName("stage")
-    var syncStage: SyncStage = SyncStage.values()[0],
+    var syncStage: SyncStage = SyncStage.entries[0],
 
     @SerialName("ps")
     var parameters: SyncParameters? = null,
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncOptions.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncOptions.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncOptions.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncOptions.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncResult.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncResult.kt
similarity index 95%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncResult.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncResult.kt
index 9204065..e3a0ec4 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncResult.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncResult.kt
@@ -3,20 +3,22 @@ package com.mimetis.dotmim.sync
 import com.mimetis.dotmim.sync.messages.DatabaseChangesApplied
 import com.mimetis.dotmim.sync.messages.DatabaseChangesSelected
 import kotlinx.serialization.Serializable
-import java.util.*
 import kotlin.math.max
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Context of the current Sync session
  * Encapsulates data changes and metadata for a synchronization session.
  */
+@OptIn(ExperimentalUuidApi::class)
 @Serializable
 class SyncResult(
     /**
      * Current Session, in progress
      */
-    @Serializable(with = UUIDSerializer::class)
-    var sessionId: UUID,
+    @Serializable(with = UuidSerializer::class)
+    var sessionId: Uuid,
 
     /**
      * Gets or sets the time when a sync sessionn started.
@@ -138,7 +140,7 @@ class SyncResult(
             val m = moH / 60 / 1000
             val moM = moH % (60 * 1000)
             val s = moM / 1000
-            val sb = StringBuffer()
+            val sb = StringBuilder()
             if (h < 10) {
                 sb.append(0)
             }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncTypeConverter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncTypeConverter.kt
similarity index 56%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncTypeConverter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncTypeConverter.kt
index 82c4987..b31ab45 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncTypeConverter.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncTypeConverter.kt
@@ -1,8 +1,12 @@
 package com.mimetis.dotmim.sync
 
-import java.math.BigDecimal
-import java.util.*
+import com.ionspin.kotlin.bignum.decimal.BigDecimal
+import kotlinx.datetime.LocalDateTime
+import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 object SyncTypeConverter {
     fun <T> tryConvertTo(value: Any?): T? {
         if (value == null)
@@ -14,45 +18,45 @@ object SyncTypeConverter {
         return value as? T
     }
 
-    fun tryConvertTo(value: Any?, typeOfT: Class<*>): Any? =
+    fun tryConvertTo(value: Any?, typeOfT: KClass<*>): Any? =
             when {
-                typeOfT == Short::class.java ->
+                typeOfT == Short::class ->
                     tryConvertTo<Short>(value)
-                typeOfT == Int::class.java ->
+                typeOfT == Int::class ->
                     tryConvertTo<Int>(value)
-                typeOfT == Long::class.java ->
+                typeOfT == Long::class ->
                     tryConvertTo<Long>(value)
-                typeOfT == UShort::class.java ->
+                typeOfT == UShort::class ->
                     tryConvertTo<UShort>(value)
-                typeOfT == UInt::class.java ->
+                typeOfT == UInt::class ->
                     tryConvertTo<UInt>(value)
-                typeOfT == ULong::class.java ->
+                typeOfT == ULong::class ->
                     tryConvertTo<ULong>(value)
-                typeOfT == Date::class.java ->
-                    tryConvertTo<Date>(value)
+                typeOfT == LocalDateTime::class ->
+                    tryConvertTo<LocalDateTime>(value)
 //            typeOfT == DateTimOffset::class.java->
 //                tryConvertTo<DateTimOffset>(value)
-                typeOfT == String::class.java ->
+                typeOfT == String::class ->
                     tryConvertTo<String>(value)
-                typeOfT == Byte::class.java ->
+                typeOfT == Byte::class ->
                     tryConvertTo<Byte>(value)
-                typeOfT == Boolean::class.java ->
+                typeOfT == Boolean::class ->
                     tryConvertTo<Boolean>(value)
-                typeOfT == UUID::class.java ->
-                    tryConvertTo<UUID>(value)
-                typeOfT == Char::class.java ->
+                typeOfT == Uuid::class ->
+                    tryConvertTo<Uuid>(value)
+                typeOfT == Char::class ->
                     tryConvertTo<Char>(value)
-                typeOfT == BigDecimal::class.java ->
+                typeOfT == BigDecimal::class ->
                     tryConvertTo<BigDecimal>(value)
-                typeOfT == Double::class.java ->
+                typeOfT == Double::class ->
                     tryConvertTo<Double>(value)
-                typeOfT == Float::class.java ->
+                typeOfT == Float::class ->
                     tryConvertTo<Float>(value)
 //            typeOfT == SByte::class.java->
 //                tryConvertTo<SByte>(value)
 //            typeOfT == TimeSpan::class.java->
 //                tryConvertTo<TimeSpan>(value)
-                typeOfT == ByteArray::class.java ->
+                typeOfT == ByteArray::class ->
                     tryConvertTo<ByteArray>(value)
 //            typeConverter.CanConvertFrom(typeOfT) ->
 //                Convert.ChangeType(typeConverter.ConvertFrom(value), typeOfT, provider);
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncVersion.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncVersion.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/SyncVersion.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/SyncVersion.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/Tuple.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Tuple.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/Tuple.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/Tuple.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnknownException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnknownException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnknownException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnknownException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnsupportedColumnTypeException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnsupportedColumnTypeException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnsupportedColumnTypeException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnsupportedColumnTypeException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnsupportedPrimaryKeyColumnNameException.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnsupportedPrimaryKeyColumnNameException.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/UnsupportedPrimaryKeyColumnNameException.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UnsupportedPrimaryKeyColumnNameException.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/UUIDSerializer.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UuidSerializer.kt
similarity index 53%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/UUIDSerializer.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UuidSerializer.kt
index e547c78..623324c 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/UUIDSerializer.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/UuidSerializer.kt
@@ -5,16 +5,18 @@ import kotlinx.serialization.descriptors.PrimitiveKind
 import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
 import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
-object UUIDSerializer : KSerializer<UUID> {
-    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync-java.util.UUID", PrimitiveKind.STRING)
+@OptIn(ExperimentalUuidApi::class)
+object UuidSerializer : KSerializer<Uuid> {
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync-kotlin.uuid.Uuid", PrimitiveKind.STRING)
 
-    override fun deserialize(decoder: Decoder): UUID {
-        return UUID.fromString(decoder.decodeString())
+    override fun deserialize(decoder: Decoder): Uuid {
+        return Uuid.parse(decoder.decodeString())
     }
 
-    override fun serialize(encoder: Encoder, value: UUID) {
+    override fun serialize(encoder: Encoder, value: Uuid) {
         encoder.encodeString(value.toString().uppercase())
     }
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt
similarity index 95%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt
index 40939cc..1f7b708 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ApplyChangesFailedArgs.kt
@@ -5,11 +5,13 @@ import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.enumerations.ConflictResolution
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncRow
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Raised as an argument when an apply is failing. Waiting from user for the conflict resolution
  */
+@OptIn(ExperimentalUuidApi::class)
 class ApplyChangesFailedArgs(
     context: SyncContext,
 
@@ -23,7 +25,7 @@ class ApplyChangesFailedArgs(
     /**
      * Gets or Sets the scope id who will be marked as winner
      */
-    val senderScopeId: UUID?
+    val senderScopeId: Uuid?
 ) : ProgressArgs(context) {
     private var _resolution: ConflictResolution = resolution
 
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesAppliedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesAppliedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesAppliedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesAppliedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesSelectedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesSelectedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesSelectedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesSelectedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesSelectingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesSelectingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DatabaseChangesSelectingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DatabaseChangesSelectingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt
similarity index 91%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt
index bc4630c..efa8416 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisionedArgs.kt
@@ -4,11 +4,10 @@ import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncSet
-import java.util.*
 
 class DeprovisionedArgs(
     context: SyncContext,
-    val provision: EnumSet<SyncProvision>,
+    provision: Set<SyncProvision>,
     val schema: SyncSet
 ) : ProgressArgs(context) {
     override val message: String =
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt
similarity index 92%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt
index cb69a6b..e8c75aa 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeprovisioningArgs.kt
@@ -4,7 +4,6 @@ import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncSet
-import java.util.*
 
 class DeprovisioningArgs(
     context: SyncContext,
@@ -12,7 +11,7 @@ class DeprovisioningArgs(
     /**
      * Get the provision type (Flag enum)
      */
-    val provision: EnumSet<SyncProvision>,
+    val provision: Set<SyncProvision>,
 
     /**
      * Gets the schema to be applied in the database
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt
similarity index 82%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt
index aaa0d68..ad2d5f0 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/DeserializingSetArgs.kt
@@ -3,8 +3,8 @@ package com.mimetis.dotmim.sync.args
 import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.ContainerSet
-import java.io.File
-import java.io.FileOutputStream
+import kotlinx.io.RawSink
+import kotlinx.io.files.Path
 
 /**
  * Raise just after loading a binary change set from disk, just before calling the deserializer
@@ -15,7 +15,7 @@ class DeserializingSetArgs(
     /**
      * Gets the Filestream to deserialize
      */
-    val fileStream: FileOutputStream,
+    val fileStream: RawSink,
 
     /**
      * File name containing the set to be deserialized
@@ -26,7 +26,7 @@ class DeserializingSetArgs(
      * Directory containing the file, about to be deserialized
      */
     val directoryPath: String
-) : ProgressArgs(context) {
+) : ProgressArgs(context), AutoCloseable {
     override val message: String =
         "[$fileName] Deserializing Set."
 
@@ -34,12 +34,16 @@ class DeserializingSetArgs(
         8050
 
     override val source: String =
-        if (directoryPath.isBlank()) "" else File(directoryPath).name
+        if (directoryPath.isBlank()) "" else Path(directoryPath).name
 
     /**
      * Gets or Sets the container set result, after having deserialized the FileStream. If the Result property is Null, Dotmim.Sync will deserialized the stream using a simple Json converter
      */
     var result: ContainerSet? = null
+
+    override fun close() {
+        fileStream.close()
+    }
 }
 
 /**
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpBatchesDownloadedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpBatchesDownloadedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpBatchesDownloadedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpBatchesDownloadedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpBatchesDownloadingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpBatchesDownloadingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpBatchesDownloadingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpBatchesDownloadingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingSchemaRequestArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingSchemaRequestArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingSchemaRequestArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingSchemaRequestArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingSchemaResponseArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingSchemaResponseArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingSchemaResponseArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingSchemaResponseArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingScopeRequestArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingScopeRequestArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingScopeRequestArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingScopeRequestArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingServerChangesRequestArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingServerChangesRequestArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingServerChangesRequestArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingServerChangesRequestArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingServerChangesResponseArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingServerChangesResponseArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpGettingServerChangesResponseArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpGettingServerChangesResponseArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpSendingClientChangesRequestArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpSendingClientChangesRequestArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/HttpSendingClientChangesRequestArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/HttpSendingClientChangesRequestArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/OutdatedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/OutdatedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/OutdatedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/OutdatedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProgressArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProgressArgs.kt
similarity index 93%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProgressArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProgressArgs.kt
index 08409b6..72124c2 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProgressArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProgressArgs.kt
@@ -18,7 +18,7 @@ open class ProgressArgs(
      * Gets the args type
      */
     val typeName: String
-        get() = this::class.java.name
+        get() = this::class.simpleName ?: this::class.toString()
 
     /**
      * return a global message about current progress
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt
similarity index 91%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt
index ca626a6..ceeef27 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisionedArgs.kt
@@ -4,11 +4,10 @@ import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncSet
-import java.util.*
 
 class ProvisionedArgs(
     context: SyncContext,
-    val provision: EnumSet<SyncProvision>,
+    val provision: Set<SyncProvision>,
     val schema: SyncSet
 ) : ProgressArgs(context) {
     override val message: String
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt
similarity index 93%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt
index 5394cf0..25f40d4 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ProvisioningArgs.kt
@@ -4,7 +4,6 @@ import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncSet
-import java.util.*
 
 class ProvisioningArgs(
     context: SyncContext,
@@ -12,7 +11,7 @@ class ProvisioningArgs(
     /**
      * Get the provision type (Flag enum)
      */
-    val provision: EnumSet<SyncProvision>,
+    val provision: Set<SyncProvision>,
 
     /**
      * Gets the schema to be applied in the database
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SchemaLoadedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SchemaLoadedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SchemaLoadedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SchemaLoadedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SchemaLoadingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SchemaLoadingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SchemaLoadingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SchemaLoadingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeSavedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeSavedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeSavedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeSavedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeSavingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeSavingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeSavingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeSavingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeTableCreatedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeTableCreatedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeTableCreatedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeTableCreatedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeTableCreatingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeTableCreatingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/ScopeTableCreatingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/ScopeTableCreatingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt
similarity index 92%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt
index ed231e0..11ac9c2 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SerializingSetArgs.kt
@@ -3,7 +3,7 @@ package com.mimetis.dotmim.sync.args
 import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.ContainerSet
-import java.io.File
+import kotlinx.io.files.Path
 
 /**
  * Raise before serialize a change set to get a byte array
@@ -38,7 +38,7 @@ class SerializingSetArgs(
         8000
 
     override val source: String =
-        if (directoryPath.isBlank()) "" else File(directoryPath).name
+        if (directoryPath.isBlank()) "" else Path(directoryPath).name
 }
 
 /**
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt
similarity index 89%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt
index 9cd12dc..8591231 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionBeginArgs.kt
@@ -2,10 +2,12 @@ package com.mimetis.dotmim.sync.args
 
 import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
+import kotlin.uuid.ExperimentalUuidApi
 
 /**
  * Event args generated during BeginSession stage
  */
+@OptIn(ExperimentalUuidApi::class)
 class SessionBeginArgs(
         context: SyncContext
 ) : ProgressArgs(context) {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionEndArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionEndArgs.kt
similarity index 88%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionEndArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionEndArgs.kt
index e2d3e57..23b6a97 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/SessionEndArgs.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/SessionEndArgs.kt
@@ -2,10 +2,12 @@ package com.mimetis.dotmim.sync.args
 
 import com.mimetis.dotmim.sync.SyncContext
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
+import kotlin.uuid.ExperimentalUuidApi
 
 /**
  * Event args generated during EndSession stage
  */
+@OptIn(ExperimentalUuidApi::class)
 class SessionEndArgs(
     context: SyncContext
 ) : ProgressArgs(context) {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesAppliedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesAppliedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesAppliedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesAppliedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesApplyingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesApplyingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesApplyingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesApplyingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesBatchAppliedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesBatchAppliedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesBatchAppliedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesBatchAppliedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesBatchApplyingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesBatchApplyingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesBatchApplyingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesBatchApplyingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesSelectedArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesSelectedArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesSelectedArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesSelectedArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesSelectingArgs.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesSelectingArgs.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/args/TableChangesSelectingArgs.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/args/TableChangesSelectingArgs.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchInfo.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchInfo.kt
similarity index 68%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchInfo.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchInfo.kt
index e63832c..8e3cd31 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchInfo.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchInfo.kt
@@ -1,20 +1,28 @@
 package com.mimetis.dotmim.sync.batch
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import com.mimetis.dotmim.sync.DbSyncAdapter
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.set.SyncTable
-import java.io.File
-import java.text.SimpleDateFormat
-import java.util.*
-import kotlin.collections.ArrayList
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.format.char
+import kotlinx.datetime.toLocalDateTime
+import kotlinx.io.IOException
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Represents a Batch, containing a full or serialized change set
  */
+@OptIn(ExperimentalTime::class)
 @Serializable
 class BatchInfo() {
     /**
@@ -52,7 +60,7 @@ class BatchInfo() {
     /**
      * List of batch parts if not in memory
      */
-   @SerialName("parts")
+    @SerialName("parts")
     var batchPartsInfo: ArrayList<BatchPartInfo>? = null
 
     /**
@@ -76,19 +84,36 @@ class BatchInfo() {
     /**
      * Create a new BatchInfo, containing all BatchPartInfo
      */
-    constructor(inMemory: Boolean, inSchema: SyncSet, rootDirectory: String = "", directoryName: String = "") : this() {
+    constructor(
+        inMemory: Boolean,
+        inSchema: SyncSet,
+        rootDirectory: String = "",
+        directoryName: String = ""
+    ) : this() {
         this.inMemory = inMemory
 
         // We need to create a change table set, containing table with columns not readonly
         for (table in inSchema.tables)
-            DbSyncAdapter.createChangesTable(inSchema.tables[table.tableName, table.schemaName]!!, this.sanitizedSchema)
+            DbSyncAdapter.createChangesTable(
+                inSchema.tables[table.tableName, table.schemaName]!!,
+                this.sanitizedSchema
+            )
 
         // If not in memory, generate a directory name and initialize batch parts list
         if (!this.inMemory) {
             this.directoryRoot = rootDirectory
             this.batchPartsInfo = ArrayList()
             this.directoryName = if (directoryName.isNotBlank())
-                SimpleDateFormat("yyyy_MM_dd_ss", Locale.getDefault()).format(Calendar.getInstance(Locale.getDefault()).time)
+                LocalDateTime.Format {
+                    year()
+                    char('_')
+                    monthNumber()
+                    char('_')
+                    day()
+                    char('_')
+                    second()
+                    char('_')
+                }.format(Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault()))
             else
                 directoryName
         }
@@ -97,7 +122,12 @@ class BatchInfo() {
     /**
      * Add changes to batch info.
      */
-    fun addChanges(changes: SyncSet, batchIndex: Int = 0, isLastBatch: Boolean = true, orchestrator: BaseOrchestrator? = null) {
+    fun addChanges(
+        changes: SyncSet,
+        batchIndex: Int = 0,
+        isLastBatch: Boolean = true,
+        orchestrator: BaseOrchestrator? = null
+    ) {
         if (this.inMemory) {
             this.serializerFactoryKey = null
             this.inMemoryData = changes
@@ -105,7 +135,14 @@ class BatchInfo() {
 //            this.serializerFactoryKey = serializerFactoryKey.key
             val bpId = generateNewFileName(batchIndex.toString())
             //var fileName = Path.Combine(this.GetDirectoryFullPath(), bpId)
-            val bpi = BatchPartInfo.createBatchPartInfo(batchIndex, changes, bpId, getDirectoryFullPath(), isLastBatch, orchestrator)
+            val bpi = BatchPartInfo.createBatchPartInfo(
+                batchIndex,
+                changes,
+                bpId,
+                getDirectoryFullPath(),
+                isLastBatch,
+                orchestrator
+            )
 
             // add the batchpartinfo tp the current batchinfo
             this.batchPartsInfo?.add(bpi)
@@ -116,7 +153,10 @@ class BatchInfo() {
      * Get the full path of the Batch directory
      */
     fun getDirectoryFullPath(): String =
-            if (inMemory) "" else File(directoryRoot, directoryName).absolutePath
+        if (inMemory)
+            ""
+        else
+            Path(directoryRoot, directoryName).toString()
 
     /**
      * Ensure the last batch part (if not in memory) has the correct IsLastBatch flag
@@ -212,13 +252,33 @@ class BatchInfo() {
     fun tryRemoveDirectory() {
         // Once we have applied all the batch, we can safely remove the temp dir and all it's files
         if (!this.inMemory && this.directoryRoot.isNotBlank() && this.directoryName.isBlank()) {
-            val tmpDirectory = File(this.getDirectoryFullPath())
+            val tmpDirectory = Path(this.getDirectoryFullPath())
 
-            if (!tmpDirectory.exists())
+            if (!SystemFileSystem.exists(tmpDirectory))
                 return
 
             try {
-                tmpDirectory.deleteRecursively()
+                val stack = ArrayList<Path>()
+                stack.add(tmpDirectory)
+                while (stack.isNotEmpty()) {
+                    val path = stack.first()
+                    val children = try {
+                        SystemFileSystem.list(path)
+                    } catch (_: IOException) {
+                        // Not a directory
+                        SystemFileSystem.delete(path)
+                        stack.remove(path)
+                        continue
+                    } catch (_: Throwable) {
+                        emptyList()
+                    }
+                    if (children.isEmpty()) {
+                        SystemFileSystem.delete(path)
+                        stack.remove(path)
+                    } else {
+                        stack.addAll(children)
+                    }
+                }
             }
             // do nothing here
             catch (e: Exception) {
@@ -226,7 +286,11 @@ class BatchInfo() {
         }
     }
 
-    fun getTable(tableName: String, schemaName: String, orchestrator: BaseOrchestrator? = null): List<SyncTable?> {
+    fun getTable(
+        tableName: String,
+        schemaName: String,
+        orchestrator: BaseOrchestrator? = null
+    ): List<SyncTable?> {
         if (this.sanitizedSchema == null)
             throw NullPointerException("Batch info schema should not be null")
 
@@ -238,18 +302,35 @@ class BatchInfo() {
                 return listOf(this.inMemoryData!!.tables[tableName, schemaName]!!)
         } else {
             val bpiTables = batchPartsInfo
-                    ?.filter { bpi -> bpi.rowsCount > 0 && bpi.tables!!.any { t -> t.equalsByName(tableInfo) } }
-                    ?.sortedBy { t -> t.index }
+                ?.filter { bpi ->
+                    bpi.rowsCount > 0 && bpi.tables!!.any { t ->
+                        t.equalsByName(
+                            tableInfo
+                        )
+                    }
+                }
+                ?.sortedBy { t -> t.index }
 
             if (bpiTables != null) {
                 return bpiTables.mapNotNull { batchPartinInfo ->
                     // load only if not already loaded in memory
                     if (batchPartinInfo.data == null)
-                        batchPartinInfo.loadBatch(this.sanitizedSchema, getDirectoryFullPath(), orchestrator)
+                        batchPartinInfo.loadBatch(
+                            this.sanitizedSchema,
+                            getDirectoryFullPath(),
+                            orchestrator
+                        )
 
                     // Get the table from the batchPartInfo
                     // generate a tmp SyncTable for
-                    val batchTable = batchPartinInfo.data?.tables?.firstOrNull { bt -> bt.equalsByName(SyncTable(tableName, schemaName)) }
+                    val batchTable = batchPartinInfo.data?.tables?.firstOrNull { bt ->
+                        bt.equalsByName(
+                            SyncTable(
+                                tableName,
+                                schemaName
+                            )
+                        )
+                    }
 
                     if (batchTable != null) {
 
@@ -269,6 +350,7 @@ class BatchInfo() {
     }
 
 
+    @OptIn(ExperimentalUuidApi::class)
     companion object {
         /**
          * generate a batch file name
@@ -282,7 +364,7 @@ class BatchInfo() {
                 else -> throw Exception("OverflowException: too much batches !!!")
             }
 
-            return "${index}_${UUID.randomUUID().toString().replace(".", "_")}.batch"
+            return "${index}_${Uuid.random().toString().replace(".", "_")}.batch"
         }
     }
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt
similarity index 82%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt
index 8f13a0a..6b6d2cb 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchPartInfo.kt
@@ -1,14 +1,23 @@
 package com.mimetis.dotmim.sync.batch
 
-import kotlinx.serialization.*
-import kotlinx.serialization.json.Json
 import com.mimetis.dotmim.sync.MissingFileException
 import com.mimetis.dotmim.sync.args.DeserializingSetArgs
 import com.mimetis.dotmim.sync.args.SerializingSetArgs
 import com.mimetis.dotmim.sync.orchestrators.BaseOrchestrator
 import com.mimetis.dotmim.sync.set.ContainerSet
 import com.mimetis.dotmim.sync.set.SyncSet
-import java.io.File
+import io.ktor.utils.io.core.toByteArray
+import io.ktor.utils.io.readText
+import kotlinx.io.buffered
+import kotlinx.io.bytestring.ByteString
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlinx.io.write
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.json.Json
+import kotlin.reflect.KClass
 
 /**
  * Info about a BatchPart
@@ -47,7 +56,7 @@ class BatchPartInfo {
      * Gets or Sets the serialized type
      */
     @Transient
-    var serializedType: Class<*>? = null
+    var serializedType: KClass<*>? = null
 
     /**
      * Loads the batch file and import the rows in a SyncSet instance
@@ -91,24 +100,24 @@ class BatchPartInfo {
         if (fileName.isBlank())
             throw Exception("ArgumentNullException: fileName")
 
-        val file = File(directoryFullPath, fileName)
+        val file = Path(directoryFullPath, fileName)
         //val fullPath = Path.Combine(directoryFullPath, fileName)
 
-        if (!file.exists())
-            throw MissingFileException(file.absolutePath)
+        if (!SystemFileSystem.exists(file))
+            throw MissingFileException(file.toString())
 
         //var jsonConverter = new Utf8JsonConverter<ContainerSet>()
 
         // backward compatibility
         if (serializedType == null)
-            serializedType = ContainerSet::class.java
+            serializedType = ContainerSet::class
 
         var set: ContainerSet? = null
 
         if (orchestrator != null) {
             val interceptorArgs = DeserializingSetArgs(
                 orchestrator.getContext(),
-                file.outputStream(),
+                SystemFileSystem.sink(file),
                 fileName,
                 directoryFullPath
             )
@@ -121,10 +130,11 @@ class BatchPartInfo {
                 ignoreUnknownKeys = true
                 isLenient = true
             }
-            set = if (serializedType == ContainerSet::class.java) {
-                json.decodeFromString(file.readText())
+            val jsonText = SystemFileSystem.source(file).use { it.buffered().readText() }
+            set = if (serializedType == ContainerSet::class) {
+                json.decodeFromString(jsonText)
             } else {
-                val jsonString: ContainerSetBoilerPlate = json.decodeFromString(file.readText())
+                val jsonString: ContainerSetBoilerPlate = json.decodeFromString(jsonText)
                 jsonString.changes
             }
         }
@@ -145,12 +155,12 @@ class BatchPartInfo {
             if (set == null)
                 return
 
-            val dir = File(directoryFullPath)
+            val dir = Path(directoryFullPath)
 
-            if (!dir.exists())
-                dir.mkdir()
+            if (!SystemFileSystem.exists(dir))
+                SystemFileSystem.createDirectories(dir)
 
-            val file = File(directoryFullPath, fileName)
+            val file = Path(directoryFullPath, fileName)
 
             var serializedBytes: ByteArray? = null
 
@@ -170,7 +180,9 @@ class BatchPartInfo {
                 serializedBytes = jsonString.toByteArray()
             }
 
-            file.writeBytes(serializedBytes)
+            SystemFileSystem.sink(file).use {
+                it.buffered().write(ByteString(serializedBytes))
+            }
         }
 
         /**
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchPartTableInfo.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchPartTableInfo.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/batch/BatchPartTableInfo.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/batch/BatchPartTableInfo.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbBuilder.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbBuilder.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbBuilder.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbMetadata.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbMetadata.kt
similarity index 95%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbMetadata.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbMetadata.kt
index 7d4dc9e..943ca63 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbMetadata.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbMetadata.kt
@@ -2,6 +2,7 @@ package com.mimetis.dotmim.sync.builders
 
 import com.mimetis.dotmim.sync.set.SyncColumn
 import com.mimetis.dotmim.sync.setup.DbType
+import kotlin.reflect.KClass
 
 abstract class DbMetadata {
     /**
@@ -22,7 +23,7 @@ abstract class DbMetadata {
     /**
      * Get a managed type from a datastore dbType
      */
-    abstract fun validateType(ownerType: Any): Class<*>
+    abstract fun validateType(ownerType: Any): KClass<*>
 
     /**
      * Get a DbType from a datastore type name
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt
similarity index 79%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt
index 13ce3b5..1be8e2b 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbScopeBuilder.kt
@@ -1,8 +1,10 @@
 package com.mimetis.dotmim.sync.builders
 
 import com.mimetis.dotmim.sync.scopes.ScopeInfo
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 abstract class DbScopeBuilder(
         scopeInfoTableName: String
 ) {
@@ -11,7 +13,7 @@ abstract class DbScopeBuilder(
     abstract fun existsScopeInfoTable(): Boolean
     abstract fun createScopeInfoTable()
     abstract fun getAllScopes(scopeName: String): MutableList<ScopeInfo>
-    abstract fun existsScopeInfo(scopeId: UUID): Boolean
+    abstract fun existsScopeInfo(scopeId: Uuid): Boolean
     abstract fun insertScope(scopeInfo: ScopeInfo): ScopeInfo
     abstract fun updateScope(scopeInfo: ScopeInfo): ScopeInfo
     abstract fun getLocalTimestamp(): Long
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbScopeType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbScopeType.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbScopeType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbScopeType.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbStoredProcedureType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbStoredProcedureType.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbStoredProcedureType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbStoredProcedureType.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbTableBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbTableBuilder.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbTableBuilder.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbTableBuilder.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbTriggerType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbTriggerType.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/DbTriggerType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/DbTriggerType.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/GlobalParser.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/GlobalParser.kt
similarity index 97%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/GlobalParser.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/GlobalParser.kt
index 7257c11..1f9fca0 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/GlobalParser.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/GlobalParser.kt
@@ -1,9 +1,9 @@
 package com.mimetis.dotmim.sync.builders
 
-import java.util.concurrent.ConcurrentHashMap
+import io.ktor.util.collections.ConcurrentMap
 
 object GlobalParser {
-    private val parsers = ConcurrentHashMap<String, Lazy<ParserString>>()
+    private val parsers = ConcurrentMap<String, Lazy<ParserString>>()
 
     fun getParserString(key: String): ParserString {
         // Try to get the instance
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/ParserName.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/ParserName.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/ParserName.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/ParserName.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/ParserString.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/ParserString.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/builders/ParserString.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/builders/ParserString.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumWithValue.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/data/EnumWithValue.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumWithValue.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/data/EnumWithValue.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ApplyAction.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ApplyAction.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ApplyAction.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ApplyAction.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictResolution.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictResolution.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictResolution.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictResolution.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt
similarity index 69%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt
index 5c59d87..7977528 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictResolutionPolicy.kt
@@ -1,15 +1,12 @@
 package com.mimetis.dotmim.sync.enumerations
 
 import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByNameSerializer
-
-class ConflictResolutionPolicySerializer : EnumByNameSerializer<ConflictResolutionPolicy>()
 
 /**
  * Represents the options for the conflict resolution policy to use for synchronization.
  * Used in the configuration class
  */
-@Serializable(with = ConflictResolutionPolicySerializer::class)
+@Serializable
 enum class ConflictResolutionPolicy {
     /**
      * Indicates that the change on the server wins in case of a conflict.
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictType.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/ConflictType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/ConflictType.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt
similarity index 51%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt
index cd80bb8..673c338 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncDirection.kt
@@ -1,13 +1,17 @@
 package com.mimetis.dotmim.sync.enumerations
 
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
 import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 /**
  * Sync direction : Can be Bidirectional (default), DownloadOnly, UploadOnly
  */
-@Serializable(with = SyncDirectionSeralizer::class)
+@Serializable(with = SyncDirectionSerializer::class)
 enum class SyncDirection(override val value: Int) : EnumWithValue {
     /**
      * Table will be sync from server to client and from client to server
@@ -33,4 +37,16 @@ enum class SyncDirection(override val value: Int) : EnumWithValue {
     None(8)
 }
 
-class SyncDirectionSeralizer : EnumByValueSerializer<SyncDirection>()
+class SyncDirectionSerializer : KSerializer<SyncDirection> {
+    private var values: Map<Int, SyncDirection>? = null
+
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.SyncDirection", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: SyncDirection) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): SyncDirection =
+        (values
+            ?: SyncDirection.entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncProvision.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncProvision.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncProvision.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncProvision.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncStage.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncStage.kt
new file mode 100644
index 0000000..a24147a
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncStage.kt
@@ -0,0 +1,49 @@
+package com.mimetis.dotmim.sync.enumerations
+
+import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+@Serializable(with = SyncStageSerializer::class)
+enum class SyncStage(override val value: Int) : EnumWithValue {
+    None(0),
+
+    BeginSession(1),
+    EndSession(2),
+
+    ScopeLoading(3),
+    ScopeWriting(4),
+
+    SnapshotCreating(5),
+    SnapshotApplying(6),
+
+    SchemaReading(7),
+
+    Provisioning(8),
+    Deprovisioning(9),
+
+    ChangesSelecting(10),
+    ChangesApplying(11),
+
+    Migrating(12),
+
+    MetadataCleaning(13),
+}
+
+class SyncStageSerializer : KSerializer<SyncStage> {
+    private var values: Map<Int, SyncStage>? = null
+
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.SyncStage", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: SyncStage) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): SyncStage =
+        (values
+            ?: SyncStage.entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncType.kt
similarity index 76%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncType.kt
index 82ed8dc..30c9352 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncType.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncType.kt
@@ -1,11 +1,8 @@
 package com.mimetis.dotmim.sync.enumerations
 
 import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByNameSerializer
 
-class SyncTypeSerializer : EnumByNameSerializer<SyncType>()
-
-@Serializable(with = SyncTypeSerializer::class)
+@Serializable
 enum class SyncType {
     /// <summary>
     /// Normal synchronization
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncWay.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncWay.kt
new file mode 100644
index 0000000..3b25a09
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/enumerations/SyncWay.kt
@@ -0,0 +1,41 @@
+package com.mimetis.dotmim.sync.enumerations
+
+import kotlinx.serialization.Serializable
+import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+class SyncWaySerializer : KSerializer<SyncWay> {
+    private var values: Map<Int, SyncWay>? = null
+
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.SyncWay", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: SyncWay) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): SyncWay =
+        (values
+            ?: SyncWay.entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
+
+@Serializable(with = SyncWaySerializer::class)
+enum class SyncWay(override val value: Int) : EnumWithValue {
+    /// <summary>
+    /// No sync engaged
+    /// </summary>
+    None(0),
+
+    /// <summary>
+    /// Sync is selecting then downloading changes from server
+    /// </summary>
+    Download(1),
+
+    /// <summary>
+    /// Sync is selecting then uploading changes from client
+    /// </summary>
+    Upload(2)
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt
similarity index 74%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt
index 7449d99..36e4688 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/ISyncInterceptor.kt
@@ -1,8 +1,6 @@
 package com.mimetis.dotmim.sync.interceptors
 
-import java.io.Closeable
-
-interface ISyncInterceptor : Closeable {
+interface ISyncInterceptor : AutoCloseable {
 }
 
 interface ISyncInterceptor1<T> : ISyncInterceptor {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/InterceptorWrapper.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/InterceptorWrapper.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/InterceptorWrapper.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/InterceptorWrapper.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/Interceptors.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/Interceptors.kt
similarity index 86%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/Interceptors.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/Interceptors.kt
index 6148127..5f596bc 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/interceptors/Interceptors.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/interceptors/Interceptors.kt
@@ -1,13 +1,13 @@
 package com.mimetis.dotmim.sync.interceptors
 
 import com.mimetis.dotmim.sync.args.ProgressArgs
-import java.util.concurrent.ConcurrentHashMap
+import io.ktor.util.collections.ConcurrentMap
 import kotlin.reflect.KType
 import kotlin.reflect.typeOf
 
 class Interceptors {
     @PublishedApi
-    internal val dictionary = ConcurrentHashMap<KType, Lazy<ISyncInterceptor>>()
+    internal val dictionary = ConcurrentMap<KType, Lazy<ISyncInterceptor>>()
 
     @Suppress("EXPERIMENTAL_API_USAGE_ERROR", "UNCHECKED_CAST")
     inline fun <reified T : ProgressArgs> getInterceptor(): InterceptorWrapper<T> {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/manager/DbRelationColumnDefinition.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/manager/DbRelationColumnDefinition.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/manager/DbRelationColumnDefinition.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/manager/DbRelationColumnDefinition.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/manager/DbRelationDefinition.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/manager/DbRelationDefinition.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/manager/DbRelationDefinition.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/manager/DbRelationDefinition.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseChangesApplied.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseChangesApplied.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseChangesApplied.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseChangesApplied.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseChangesSelected.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseChangesSelected.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseChangesSelected.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseChangesSelected.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseMetadatasCleaned.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseMetadatasCleaned.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/DatabaseMetadatasCleaned.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/DatabaseMetadatasCleaned.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt
similarity index 92%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt
index 53206c0..ae501ff 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageApplyChanges.kt
@@ -4,21 +4,23 @@ import com.mimetis.dotmim.sync.batch.BatchInfo
 import com.mimetis.dotmim.sync.enumerations.ConflictResolutionPolicy
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Message exchanged during the Begin session sync stage
  */
+@OptIn(ExperimentalUuidApi::class)
 class MessageApplyChanges(
         /**
          * Gets the local Scope Id
          */
-        val localScopeId: UUID,
+        val localScopeId: Uuid,
 
         /**
          * Gets the sender Scope Id
          */
-        val senderScopeId: UUID?,
+        val senderScopeId: Uuid?,
 
         /**
          * Gets or Sets if the sync is a first sync. In this case, the last sync timestamp is ignored
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt
similarity index 86%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt
index af29845..19610fd 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/MessageGetChangesBatch.kt
@@ -2,22 +2,25 @@ package com.mimetis.dotmim.sync.messages
 
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
+import kotlinx.io.files.Path
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Message exchanged during the Get Changes Batch sync stage
  */
+@OptIn(ExperimentalUuidApi::class)
 class MessageGetChangesBatch(
         /**
          * Gets or Sets the Scope Id that should be excluded when we get lines from the local store
          * Usable only from Server side
          */
-        var excludingScopeId: UUID? = null,
+        var excludingScopeId: Uuid? = null,
 
         /**
          * Gets or Sets the local Scope Id that will replace <NULL> values when creating the row
          */
-        var localScopeId: UUID,
+        var localScopeId: Uuid,
 
         /**
          * Gets or Sets if the sync is a first sync. In this case, the last sync timestamp is ignored
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableChangesApplied.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableChangesApplied.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableChangesApplied.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableChangesApplied.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableChangesSelected.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableChangesSelected.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableChangesSelected.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableChangesSelected.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableMetadatasCleaned.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableMetadatasCleaned.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/messages/TableMetadatasCleaned.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/messages/TableMetadatasCleaned.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt
similarity index 93%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt
index 05399b0..74c2f48 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/BaseOrchestrator.kt
@@ -1,26 +1,98 @@
 package com.mimetis.dotmim.sync.orchestrators
 
-import android.database.Cursor
-import com.mimetis.dotmim.sync.*
-import com.mimetis.dotmim.sync.args.*
+import androidx.sqlite.SQLiteStatement
+import com.mimetis.dotmim.sync.CoreProvider
+import com.mimetis.dotmim.sync.DataRowState
+import com.mimetis.dotmim.sync.DbSyncAdapter
+import com.mimetis.dotmim.sync.MissingColumnException
+import com.mimetis.dotmim.sync.MissingPrimaryKeyColumnException
+import com.mimetis.dotmim.sync.MissingPrimaryKeyException
+import com.mimetis.dotmim.sync.MissingTableException
+import com.mimetis.dotmim.sync.MissingTablesException
+import com.mimetis.dotmim.sync.MissingsColumnException
+import com.mimetis.dotmim.sync.OutOfDateException
+import com.mimetis.dotmim.sync.Progress
+import com.mimetis.dotmim.sync.RollbackException
+import com.mimetis.dotmim.sync.RowOverSizedException
+import com.mimetis.dotmim.sync.SyncConflict
+import com.mimetis.dotmim.sync.SyncContext
+import com.mimetis.dotmim.sync.SyncOptions
+import com.mimetis.dotmim.sync.SyncVersion
+import com.mimetis.dotmim.sync.Tuple
+import com.mimetis.dotmim.sync.UnknownException
+import com.mimetis.dotmim.sync.UnsupportedColumnTypeException
+import com.mimetis.dotmim.sync.UnsupportedPrimaryKeyColumnNameException
+import com.mimetis.dotmim.sync.args.ApplyChangesFailedArgs
+import com.mimetis.dotmim.sync.args.DatabaseChangesAppliedArgs
+import com.mimetis.dotmim.sync.args.DatabaseChangesSelectedArgs
+import com.mimetis.dotmim.sync.args.DatabaseChangesSelectingArgs
+import com.mimetis.dotmim.sync.args.DeprovisionedArgs
+import com.mimetis.dotmim.sync.args.DeprovisioningArgs
+import com.mimetis.dotmim.sync.args.OutdatedAction
+import com.mimetis.dotmim.sync.args.OutdatedArgs
+import com.mimetis.dotmim.sync.args.ProgressArgs
+import com.mimetis.dotmim.sync.args.ProvisionedArgs
+import com.mimetis.dotmim.sync.args.ProvisioningArgs
+import com.mimetis.dotmim.sync.args.SchemaLoadedArgs
+import com.mimetis.dotmim.sync.args.SchemaLoadingArgs
+import com.mimetis.dotmim.sync.args.ScopeSavedArgs
+import com.mimetis.dotmim.sync.args.ScopeSavingArgs
+import com.mimetis.dotmim.sync.args.ScopeTableCreatedArgs
+import com.mimetis.dotmim.sync.args.ScopeTableCreatingArgs
+import com.mimetis.dotmim.sync.args.TableChangesAppliedArgs
+import com.mimetis.dotmim.sync.args.TableChangesApplyingArgs
+import com.mimetis.dotmim.sync.args.TableChangesBatchAppliedArgs
+import com.mimetis.dotmim.sync.args.TableChangesBatchApplyingArgs
+import com.mimetis.dotmim.sync.args.TableChangesSelectedArgs
+import com.mimetis.dotmim.sync.args.TableChangesSelectingArgs
 import com.mimetis.dotmim.sync.batch.BatchInfo
-import com.mimetis.dotmim.sync.builders.*
-import com.mimetis.dotmim.sync.enumerations.*
+import com.mimetis.dotmim.sync.builders.DbScopeBuilder
+import com.mimetis.dotmim.sync.builders.DbScopeType
+import com.mimetis.dotmim.sync.builders.DbStoredProcedureType
+import com.mimetis.dotmim.sync.builders.DbTableBuilder
+import com.mimetis.dotmim.sync.builders.DbTriggerType
+import com.mimetis.dotmim.sync.enumerations.ApplyAction
+import com.mimetis.dotmim.sync.enumerations.ConflictResolution
+import com.mimetis.dotmim.sync.enumerations.ConflictResolutionPolicy
+import com.mimetis.dotmim.sync.enumerations.ConflictType
+import com.mimetis.dotmim.sync.enumerations.SyncDirection
+import com.mimetis.dotmim.sync.enumerations.SyncProvision
+import com.mimetis.dotmim.sync.enumerations.SyncStage
+import com.mimetis.dotmim.sync.enumerations.SyncType
+import com.mimetis.dotmim.sync.enumerations.SyncWay
 import com.mimetis.dotmim.sync.interceptors.Interceptors
 import com.mimetis.dotmim.sync.manager.DbRelationDefinition
-import com.mimetis.dotmim.sync.messages.*
+import com.mimetis.dotmim.sync.messages.DatabaseChangesApplied
+import com.mimetis.dotmim.sync.messages.DatabaseChangesSelected
+import com.mimetis.dotmim.sync.messages.DatabaseMetadatasCleaned
+import com.mimetis.dotmim.sync.messages.MessageApplyChanges
+import com.mimetis.dotmim.sync.messages.MessageGetChangesBatch
+import com.mimetis.dotmim.sync.messages.TableChangesApplied
+import com.mimetis.dotmim.sync.messages.TableChangesSelected
+import com.mimetis.dotmim.sync.messages.TableMetadatasCleaned
 import com.mimetis.dotmim.sync.parameter.SyncParameters
 import com.mimetis.dotmim.sync.scopes.ScopeInfo
 import com.mimetis.dotmim.sync.scopes.ServerScopeInfo
-import com.mimetis.dotmim.sync.set.*
+import com.mimetis.dotmim.sync.set.ContainerTable
+import com.mimetis.dotmim.sync.set.CustomList
+import com.mimetis.dotmim.sync.set.SyncColumn
+import com.mimetis.dotmim.sync.set.SyncColumnIdentifier
+import com.mimetis.dotmim.sync.set.SyncFilter
+import com.mimetis.dotmim.sync.set.SyncRelation
+import com.mimetis.dotmim.sync.set.SyncRow
+import com.mimetis.dotmim.sync.set.SyncSet
+import com.mimetis.dotmim.sync.set.SyncTable
+import com.mimetis.dotmim.sync.set.isNullOrEmpty
 import com.mimetis.dotmim.sync.setup.SetupTable
 import com.mimetis.dotmim.sync.setup.SyncSetup
 import com.mimetis.dotmim.sync.sqlite.CursorHelper.getValue
-import java.io.File
-import java.util.*
-import kotlin.collections.ArrayList
-import kotlin.collections.HashSet
+import com.mimetis.dotmim.sync.utcNow
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 abstract class BaseOrchestrator(
     /**
      * Gets or Sets the provider used by this local orchestrator
@@ -80,7 +152,7 @@ abstract class BaseOrchestrator(
 
     open fun getContext(): SyncContext {
         return syncContext ?: SyncContext(
-            sessionId = UUID.randomUUID(),
+            sessionId = Uuid.random(),
             scopeName = this.scopeName
         )
     }
@@ -103,7 +175,7 @@ abstract class BaseOrchestrator(
         overwrite: Boolean,
         schema: SyncSet,
         setup: SyncSetup,
-        provision: EnumSet<SyncProvision>,
+        provision: MutableSet<SyncProvision>,
         scope: Any?,
         progress: Progress<ProgressArgs>?
     ): SyncSet {
@@ -317,7 +389,7 @@ abstract class BaseOrchestrator(
         val scopes = scopeBuilder.getAllScopes(scopeName)
         if (scopes.isEmpty()) {
             var scope = ScopeInfo(
-                id = UUID.randomUUID(),
+                id = Uuid.random(),
                 name = scopeName,
                 isNewScope = true,
                 lastSync = null,
@@ -455,7 +527,7 @@ abstract class BaseOrchestrator(
                     this.provider.getProviderTypeName()
                 )
 
-            val columnNameLower = column.columnName.lowercase(Locale.getDefault())
+            val columnNameLower = column.columnName.lowercase()
             if (columnNameLower == "sync_scope_id"
                 || columnNameLower == "changeTable"
                 || columnNameLower == "sync_scope_name"
@@ -561,7 +633,7 @@ abstract class BaseOrchestrator(
             if (columnKey == null)
                 throw MissingPrimaryKeyColumnException(rowColumn.columnName, schemaTable.tableName)
 
-            val columnNameLower = columnKey.columnName.lowercase(Locale.getDefault())
+            val columnNameLower = columnKey.columnName.lowercase()
             if (columnNameLower == "update_scope_id" ||
                 columnNameLower == "timestamp" ||
                 columnNameLower == "timestamp_bigint" ||
@@ -693,7 +765,7 @@ abstract class BaseOrchestrator(
     ): Boolean {
         var hasCreatedAtLeastOneTrigger = false
 
-        val listTriggerType = DbTriggerType.values()
+        val listTriggerType = DbTriggerType.entries
 
         for (triggerType in listTriggerType) {
             val exists = tableBuilder.existsTrigger(triggerType)
@@ -751,7 +823,7 @@ abstract class BaseOrchestrator(
         setup: SyncSetup,
         isNew: Boolean,
         lastTimestamp: Long?
-    ): Cursor {
+    ): SQLiteStatement {
         val tableFilter: SyncFilter?
 
         val syncAdapter = this.getSyncAdapter(syncTable, setup)
@@ -780,13 +852,13 @@ abstract class BaseOrchestrator(
     /**
      * Create a new SyncRow from a dataReader.
      */
-    internal fun createSyncRowFromReader(cursor: Cursor, table: SyncTable): SyncRow {
+    internal fun createSyncRowFromReader(cursor: SQLiteStatement, table: SyncTable): SyncRow {
         // Create a new row, based on table structure
         val row = table.newRow()
 
         var isTombstone = false
 
-        for (i in 0 until cursor.columnCount) {
+        for (i in 0 until cursor.getColumnCount()) {
             val columnName = cursor.getColumnName(i)
 
             // if we have the tombstone value, do not add it to the table
@@ -952,7 +1024,7 @@ abstract class BaseOrchestrator(
         if (batchInfo.inMemory)
             return false
 
-        val batchInfoDirectoryFullPath = File(batchInfo.getDirectoryFullPath())
+        val batchInfoDirectoryFullPath = SystemFileSystem.resolve(Path( batchInfo.getDirectoryFullPath()))
 
         val (snapshotRootDirectory, snapshotNameDirectory) = this.getSnapshotDirectory()
 
@@ -960,12 +1032,11 @@ abstract class BaseOrchestrator(
         if (snapshotRootDirectory.isBlank())
             return true
 
-        val snapInfo = File(snapshotRootDirectory, snapshotNameDirectory).absolutePath
-        val snapshotDirectoryFullPath = File(snapInfo)
+        val snapInfo = Path(snapshotRootDirectory, snapshotNameDirectory)
+        val snapshotDirectoryFullPath = SystemFileSystem.resolve(snapInfo)
 
         // check if the batch dir IS NOT the snapshot directory
-        val canCleanFolder =
-            batchInfoDirectoryFullPath.absolutePath != snapshotDirectoryFullPath.absolutePath
+        val canCleanFolder = batchInfoDirectoryFullPath.toString() != snapshotDirectoryFullPath.toString()
 
         return canCleanFolder
     }
@@ -995,8 +1066,7 @@ abstract class BaseOrchestrator(
         // cleansing scope name
         val directoryScopeName = context.scopeName.filter { it.isLetterOrDigit() }
 
-        val directoryFullPath =
-            File(this.options.snapshotsDirectory, directoryScopeName).absolutePath
+        val directoryFullPath = SystemFileSystem.resolve(Path(this.options.snapshotsDirectory, directoryScopeName))
 
         val sb = StringBuilder()
         var underscore = ""
@@ -1014,7 +1084,7 @@ abstract class BaseOrchestrator(
         var directoryName = sb.toString()
         directoryName = if (directoryName.isBlank()) "ALL" else directoryName
 
-        return Pair(directoryFullPath, directoryName)
+        return Pair(directoryFullPath.toString(), directoryName)
     }
 
     /**
@@ -1295,7 +1365,7 @@ abstract class BaseOrchestrator(
      * The int returned is the conflict count I need
      */
     private fun handleConflict(
-        localScopeId: UUID, senderScopeId: UUID?, syncAdapter: DbSyncAdapter,
+        localScopeId: Uuid, senderScopeId: Uuid?, syncAdapter: DbSyncAdapter,
         context: SyncContext, conflictRow: SyncRow, schemaChangesTable: SyncTable,
         policy: ConflictResolutionPolicy, lastTimestamp: Long?
     ): Triple<Int, SyncRow?, Int> {
@@ -1451,10 +1521,10 @@ abstract class BaseOrchestrator(
      * A conflict has occured, we try to ask for the solution to the user
      */
     private fun getConflictAction(
-        context: SyncContext, localScopeId: UUID?, syncAdapter: DbSyncAdapter,
+        context: SyncContext, localScopeId: Uuid?, syncAdapter: DbSyncAdapter,
         conflictRow: SyncRow, schemaChangesTable: SyncTable, policy: ConflictResolutionPolicy,
-        senderScopeId: UUID?
-    ): Tuple<ApplyAction, ConflictType, SyncRow?, SyncRow?, UUID?> {
+        senderScopeId: Uuid?
+    ): Tuple<ApplyAction, ConflictType, SyncRow?, SyncRow?, Uuid?> {
         // default action
         var resolution =
             if (policy == ConflictResolutionPolicy.ClientWins) ConflictResolution.ClientWins else ConflictResolution.ServerWins
@@ -1467,7 +1537,7 @@ abstract class BaseOrchestrator(
 
         var finalRow: SyncRow? = null
         var localRow: SyncRow? = null
-        var finalSenderScopeId: UUID? = senderScopeId
+        var finalSenderScopeId: Uuid? = senderScopeId
 
         // default conflict type
         var conflictType =
@@ -1566,7 +1636,7 @@ abstract class BaseOrchestrator(
     private fun internalGetConflictRow(
         context: SyncContext,
         syncAdapter: DbSyncAdapter,
-        localScopeId: UUID,
+        localScopeId: Uuid,
         primaryKeyRow: SyncRow,
         schema: SyncTable
     ): SyncRow? {
@@ -1577,14 +1647,14 @@ abstract class BaseOrchestrator(
             val changesSet = schema.schema!!.clone(false)
             val selectTable = DbSyncAdapter.createChangesTable(schema, changesSet)
 
-            if (!dataReader.moveToNext()) {
+            if (!dataReader.step()) {
                 dataReader.close()
                 return null
             }
 
             // Create a new empty row
             val syncRow = selectTable.newRow()
-            for (i in 0 until dataReader.columnCount) {
+            for (i in 0 until dataReader.getColumnCount()) {
                 val columnName = dataReader.getColumnName(i)
 
                 // if we have the tombstone value, do not add it to the table
@@ -1640,7 +1710,7 @@ abstract class BaseOrchestrator(
      */
     private fun internalApplyConflictUpdate(
         context: SyncContext, syncAdapter: DbSyncAdapter,
-        row: SyncRow, lastTimestamp: Long?, senderScopeId: UUID?,
+        row: SyncRow, lastTimestamp: Long?, senderScopeId: Uuid?,
         forceWrite: Boolean
     ): Boolean {
         if (row.table == null)
@@ -1657,7 +1727,7 @@ abstract class BaseOrchestrator(
      */
     private fun internalApplyConflictDelete(
         context: SyncContext, syncAdapter: DbSyncAdapter,
-        row: SyncRow, lastTimestamp: Long?, senderScopeId: UUID?,
+        row: SyncRow, lastTimestamp: Long?, senderScopeId: Uuid?,
         forceWrite: Boolean
     ): Boolean {
         if (row.table == null)
@@ -1675,7 +1745,7 @@ abstract class BaseOrchestrator(
      */
     private fun internalUpdateMetadatas(
         context: SyncContext, syncAdapter: DbSyncAdapter,
-        row: SyncRow, senderScopeId: UUID?, forceWrite: Boolean
+        row: SyncRow, senderScopeId: Uuid?, forceWrite: Boolean
     ): Boolean {
         val metadataUpdatedRowsCount = syncAdapter.updateMetadata(
             senderScopeId,
@@ -1747,8 +1817,9 @@ abstract class BaseOrchestrator(
         intercept(DatabaseChangesSelectingArgs(context, message))
 
         // create local directory
-        if (message.batchSize > 0 && message.batchDirectory.isNotBlank() && !File(message.batchDirectory).exists()) {
-            File(message.batchDirectory).mkdir()
+        val batchPath = Path(message.batchDirectory)
+        if (message.batchSize > 0 && message.batchDirectory.isNotBlank() && !SystemFileSystem.exists(batchPath)) {
+            SystemFileSystem.createDirectories(batchPath)
         }
 
         changesSelected = DatabaseChangesSelected()
@@ -1813,7 +1884,7 @@ abstract class BaseOrchestrator(
                 // memory size total
                 var rowsMemorySize = 0.0
 
-                while (cursor.moveToNext()) {
+                while (cursor.step()) {
 //                Log.d(TAG, "Reading ${changesSetTable.tableName} row: ${cursor.position} of ${cursor.count}")
                     // Create a row from dataReader
                     val row = createSyncRowFromReader(cursor, changesSetTable)
@@ -1957,7 +2028,7 @@ abstract class BaseOrchestrator(
         ctx: SyncContext,
         schema: SyncSet,
         setup: SyncSetup,
-        provision: EnumSet<SyncProvision>,
+        provision: MutableSet<SyncProvision>,
         scope: Any?,
         progress: Progress<ProgressArgs>? = null
     ): Boolean {
@@ -1990,9 +2061,7 @@ abstract class BaseOrchestrator(
             val tableBuilder = this.getTableBuilder(schemaTable, setup)
 
             if (provision.contains(SyncProvision.StoredProcedures)) {
-                val allStoredProcedures = DbStoredProcedureType.values()
-
-                allStoredProcedures.reverse()
+                val allStoredProcedures = DbStoredProcedureType.entries.reversed()
 
                 for (storedProcedureType in allStoredProcedures) {
                     // if we are iterating on bulk, but provider do not support it, just loop through and continue
@@ -2024,7 +2093,7 @@ abstract class BaseOrchestrator(
             }
 
             if (provision.contains(SyncProvision.Triggers)) {
-                for (triggerType in DbTriggerType.values()) {
+                for (triggerType in DbTriggerType.entries) {
                     val exists = internalExistsTrigger(ctx, tableBuilder, triggerType, progress)
 
                     // Drop trigger if already exists
@@ -2226,7 +2295,7 @@ abstract class BaseOrchestrator(
     }
 
     companion object {
-        private val TAG = BaseOrchestrator::class.java.simpleName
+        private val TAG = BaseOrchestrator::class.simpleName
     }
 }
 
@@ -2236,7 +2305,7 @@ abstract class BaseOrchestrator(
  * @param throwOnCycle if true throw exception if Cyclic dependency found
  * @param defaultCapacity default capacity of sorterd buffer
  */
-private fun List<SyncTable>.sortByDependencies(
+private fun CustomList<SyncTable>.sortByDependencies(
     dependencies: (SyncTable) -> List<SyncTable>,
     throwOnCycle: Boolean = false,
     defaultCapacity: Int = 10
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt
similarity index 93%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt
index bb42f39..3f13689 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/LocalOrchestrator.kt
@@ -1,6 +1,15 @@
 package com.mimetis.dotmim.sync.orchestrators
 
-import com.mimetis.dotmim.sync.*
+import com.mimetis.dotmim.sync.CoreProvider
+import com.mimetis.dotmim.sync.DbSyncAdapter
+import com.mimetis.dotmim.sync.MissingClientScopeInfoException
+import com.mimetis.dotmim.sync.MissingLocalOrchestratorSchemaException
+import com.mimetis.dotmim.sync.MissingTablesException
+import com.mimetis.dotmim.sync.MissingTrackingTableException
+import com.mimetis.dotmim.sync.Progress
+import com.mimetis.dotmim.sync.SyncContext
+import com.mimetis.dotmim.sync.SyncOptions
+import com.mimetis.dotmim.sync.SyncVersion
 import com.mimetis.dotmim.sync.SyncVersion.major
 import com.mimetis.dotmim.sync.SyncVersion.toVersionInt
 import com.mimetis.dotmim.sync.args.ProgressArgs
@@ -13,13 +22,20 @@ import com.mimetis.dotmim.sync.enumerations.ConflictResolutionPolicy
 import com.mimetis.dotmim.sync.enumerations.SyncProvision
 import com.mimetis.dotmim.sync.enumerations.SyncStage
 import com.mimetis.dotmim.sync.enumerations.SyncWay
-import com.mimetis.dotmim.sync.messages.*
+import com.mimetis.dotmim.sync.messages.DatabaseChangesApplied
+import com.mimetis.dotmim.sync.messages.DatabaseChangesSelected
+import com.mimetis.dotmim.sync.messages.DatabaseMetadatasCleaned
+import com.mimetis.dotmim.sync.messages.MessageApplyChanges
+import com.mimetis.dotmim.sync.messages.MessageGetChangesBatch
 import com.mimetis.dotmim.sync.scopes.ScopeInfo
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.set.SyncTable
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
+import com.mimetis.dotmim.sync.utcNow
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 class LocalOrchestrator(
     provider: CoreProvider,
     options: SyncOptions,
@@ -172,7 +188,7 @@ class LocalOrchestrator(
 
         // On local, we don't want to chase rows from "others"
         // We just want our local rows, so we dont exclude any remote scope id, by setting scope id to NULL
-        val remoteScopeId: UUID? = null
+        val remoteScopeId: Uuid? = null
         // lastSyncTS : get lines inserted / updated / deteleted after the last sync commited
         val lastSyncTS = scopeInfo.lastSyncTimestamp
         // isNew : If isNew, lasttimestamp is not correct, so grab all
@@ -305,7 +321,7 @@ class LocalOrchestrator(
         // Create the message containing everything needed to apply changes
         val applyChanges = MessageApplyChanges(
             scope.id,
-            UUID.fromString("00000000-0000-0000-0000-000000000000"),
+            Uuid.NIL,
             isNew,
             lastSyncTS,
             schema,
@@ -392,7 +408,7 @@ class LocalOrchestrator(
      */
     fun provision(
         schema: SyncSet,
-        provision: EnumSet<SyncProvision>,
+        provision: MutableSet<SyncProvision>,
         overwrite: Boolean = false,
         clientScopeInfo: ScopeInfo? = null,
         progress: Progress<ProgressArgs>?
@@ -434,7 +450,7 @@ class LocalOrchestrator(
      * Deprovision the orchestrator database based on the provision enumeration
      */
     open fun deprovision(
-        provision: EnumSet<SyncProvision>,
+        provision: MutableSet<SyncProvision>,
         clientScopeInfo: ScopeInfo? = null,
         progress: Progress<ProgressArgs>? = null
     ): Boolean {
@@ -460,7 +476,7 @@ class LocalOrchestrator(
      */
     fun deprovision(
         schema: SyncSet,
-        provision: EnumSet<SyncProvision>,
+        provision: MutableSet<SyncProvision>,
         clientScopeInfo: ScopeInfo? = null,
         progress: Progress<ProgressArgs>? = null
     ): Boolean {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/RemoteOrchestrator.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/RemoteOrchestrator.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/orchestrators/RemoteOrchestrator.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/orchestrators/RemoteOrchestrator.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameter.kt
similarity index 98%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameter.kt
index 01d8fa1..9d173d2 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameter.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameter.kt
@@ -3,6 +3,7 @@ package com.mimetis.dotmim.sync.parameter
 import kotlinx.serialization.*
 import com.mimetis.dotmim.sync.PrimitiveSerializer
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializable
 class SyncParameter(
         @SerialName("pn")
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameters.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameters.kt
new file mode 100644
index 0000000..0028303
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/parameter/SyncParameters.kt
@@ -0,0 +1,54 @@
+package com.mimetis.dotmim.sync.parameter
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.set.CustomList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncParametersSerializer::class)
+class SyncParameters() : CustomList<SyncParameter>() {
+    internal constructor(items: List<SyncParameter>) : this() {
+        internalList.addAll(items)
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncParametersSerializer : ArrayListLikeSerializer<SyncParameters, SyncParameter>(SyncParameter.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncParameter>()
+
+    override fun deserialize(decoder: Decoder): SyncParameters {
+        val items = ArrayList<SyncParameter>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index = compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncParameters(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt
similarity index 89%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt
index 6daccaa..a5e9ae3 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/scopes/ScopeInfo.kt
@@ -1,16 +1,18 @@
 package com.mimetis.dotmim.sync.scopes
 
+import com.mimetis.dotmim.sync.UuidSerializer
+import com.mimetis.dotmim.sync.set.SyncSet
+import com.mimetis.dotmim.sync.setup.SyncSetup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.UUIDSerializer
-import com.mimetis.dotmim.sync.set.SyncSet
-import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Mapping sur la table ScopeInfo
  */
+@OptIn(ExperimentalUuidApi::class)
 @Serializable
 class ScopeInfo(
         /**
@@ -23,8 +25,8 @@ class ScopeInfo(
          * Id of the scope owner
          */
         @SerialName("id")
-        @Serializable(with = UUIDSerializer::class)
-        var id: UUID,
+        @Serializable(with = UuidSerializer::class)
+        var id: Uuid,
 
         /**
          * Gets or Sets if the current provider is newly created one in database.
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/scopes/ServerScopeInfo.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/scopes/ServerScopeInfo.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/scopes/ServerScopeInfo.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/scopes/ServerScopeInfo.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/serialization/Converter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/serialization/Converter.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/serialization/Converter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/serialization/Converter.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/serialization/DmUtils.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/serialization/DmUtils.kt
new file mode 100644
index 0000000..a5b1356
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/serialization/DmUtils.kt
@@ -0,0 +1,56 @@
+package com.mimetis.dotmim.sync.serialization
+
+import com.ionspin.kotlin.bignum.decimal.BigDecimal
+import kotlinx.datetime.LocalDateTime
+import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalUuidApi::class)
+object DmUtils {
+    fun getAssemblyQualifiedName(valueType: KClass<*>): String =
+            when (valueType) {
+                Boolean::class ->
+                    "1"
+                Byte::class ->
+                    "2"
+                Char::class ->
+                    "3"
+                Double::class ->
+                    "4"
+                Float::class ->
+                    "5"
+                Int::class ->
+                    "6"
+                Long::class ->
+                    "7"
+                Short::class ->
+                    "8"
+                UInt::class ->
+                    "9"
+                ULong::class ->
+                    "10"
+                UShort::class ->
+                    "11"
+                ByteArray::class ->
+                    "12"
+                LocalDateTime::class ->
+                    "13"
+//                 DateTimeOffset::class.java ->
+//                    "14"
+                BigDecimal::class ->
+                    "15"
+                Uuid::class ->
+                    "16"
+                String::class ->
+                    "17"
+//                    SByte::class.java ->
+//                        "18"
+//                    TimeSpan::class.java ->
+//                        "19"
+                CharArray::class ->
+                    "20"
+                else ->
+                    valueType.simpleName ?: valueType.toString()
+            }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/CompareHelper.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CompareHelper.kt
similarity index 67%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/CompareHelper.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CompareHelper.kt
index 8b80b3f..944be66 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/CompareHelper.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CompareHelper.kt
@@ -10,7 +10,33 @@ fun <E> List<E>?.compareWith(other: List<E>?): Boolean {
         return true
 
     if (this!!.size != other!!.size)
-        return false;
+        return false
+
+    // Check all items are identical
+    return this.all { sourceItem ->
+        other.any { otherItem ->
+            val cSourceItem = sourceItem as? SyncNamedItem<E>
+            val cOtherItem = sourceItem as? SyncNamedItem<E>
+
+            if (cSourceItem != null && cOtherItem != null)
+                return cSourceItem.equalsByProperties(otherItem)
+            else
+                sourceItem == otherItem
+        }
+    }
+}
+
+fun <E> CustomList<E>?.compareWith(other: CustomList<E>?): Boolean {
+    // checking null ref
+    if ((this == null && other != null) || (this != null && other == null))
+        return false
+
+    // If both are null, return true
+    if (this == null && other == null)
+        return true
+
+    if (this!!.size != other!!.size)
+        return false
 
     // Check all items are identical
     return this.all { sourceItem ->
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/ContainerSet.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/ContainerSet.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/ContainerSet.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/ContainerSet.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/ContainerTable.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/ContainerTable.kt
similarity index 65%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/ContainerTable.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/ContainerTable.kt
index 8410576..c9c0162 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/ContainerTable.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/ContainerTable.kt
@@ -1,13 +1,17 @@
 package com.mimetis.dotmim.sync.set
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import okio.utf8Size
+import com.ionspin.kotlin.bignum.decimal.BigDecimal
 import com.mimetis.dotmim.sync.PrimitiveSerializer
 import com.mimetis.dotmim.sync.serialization.DmUtils
-import java.math.BigDecimal
-import java.util.*
+import kotlinx.datetime.LocalDateTime
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializable
 class ContainerTable(
         @SerialName("n")
@@ -28,6 +32,7 @@ class ContainerTable(
     override fun getAllNamesProperties(): List<String?> =
             listOf(tableName, schemaName)
 
+    @OptIn(ExperimentalUuidApi::class)
     companion object {
         /**
          * Calculate an estimation of the dictionary values size
@@ -36,22 +41,22 @@ class ContainerTable(
             var byteCount: Long = 0
 
             for (obj in itemArray) {
-                val objType = if (obj != null) obj::class.java else null
+                val objType = if (obj != null) obj::class else null
 
                 if (obj == null)
                     byteCount += 5
 //                else if (obj is DBNull)
 //                    byteCount += 5
-                else if (objType == String::class.java)
-                    byteCount += (obj as String).utf8Size()
-                else if (objType == ByteArray::class.java)
+                else if (objType == String::class)
+                    byteCount += (obj as String).length
+                else if (objType == ByteArray::class)
                     byteCount += (obj as ByteArray).size
                 else
-                    byteCount += getSizeForType(obj::class.java)
+                    byteCount += getSizeForType(obj::class)
 
                 // Size for the type
                 if (objType != null)
-                    byteCount += DmUtils.getAssemblyQualifiedName(objType).utf8Size()
+                    byteCount += DmUtils.getAssemblyQualifiedName(objType).length
 
                 // State
                 byteCount += 4
@@ -66,17 +71,17 @@ class ContainerTable(
         /**
          * Gets a size for a given type
          */
-        fun getSizeForType(type: Class<*>): Long =
+        fun getSizeForType(type: KClass<*>): Long =
                 when (type) {
-                    Long::class.java, ULong::class.java, Double::class.java, Date::class.java ->
+                    Long::class, ULong::class, Double::class, LocalDateTime::class ->
                         8
-                    Boolean::class.java, Byte::class.java ->
+                    Boolean::class, Byte::class ->
                         1
-                    Char::class.java, Short::class.java, UShort::class.java ->
+                    Char::class, Short::class, UShort::class ->
                         2
-                    Int::class.java, UInt::class.java, Float::class.java ->
+                    Int::class, UInt::class, Float::class ->
                         4
-                    BigDecimal::class.java, UUID::class.java ->
+                    BigDecimal::class, Uuid::class ->
                         16
                     else ->
                         0
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CustomList.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CustomList.kt
new file mode 100644
index 0000000..7c72a5b
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/CustomList.kt
@@ -0,0 +1,25 @@
+package com.mimetis.dotmim.sync.set
+
+abstract class CustomList<T>() : Iterable<T> {
+    protected val internalList = ArrayList<T>()
+
+    open fun add(element: T) = internalList.add(element)
+
+    operator fun get(index: Int): T = internalList[index]
+
+    open fun clear() {
+        internalList.clear()
+    }
+
+    val size
+        get() = internalList.size
+
+    override fun iterator(): Iterator<T> = internalList.iterator()
+
+    fun isEmpty(): Boolean = internalList.isEmpty()
+    fun isNotEmpty(): Boolean = internalList.isNotEmpty()
+
+    fun addAll(items: Iterable<T>) = internalList.addAll(items)
+}
+
+fun<T> CustomList<T>?.isNullOrEmpty(): Boolean = this == null || this.isEmpty()
\ No newline at end of file
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumn.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumn.kt
similarity index 79%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumn.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumn.kt
index 7c73041..d5ca6d2 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumn.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumn.kt
@@ -1,11 +1,15 @@
 package com.mimetis.dotmim.sync.set
 
+import com.ionspin.kotlin.bignum.decimal.BigDecimal
+import com.mimetis.dotmim.sync.setup.DbType
+import kotlinx.datetime.LocalDateTime
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.setup.DbType
-import java.math.BigDecimal
-import java.util.*
+import kotlin.reflect.KClass
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
+@OptIn(ExperimentalUuidApi::class)
 @Serializable
 class SyncColumn(
         @SerialName("n")
@@ -71,7 +75,7 @@ class SyncColumn(
         @SerialName("dv")
         var defaultValue: String? = null
 ) : SyncNamedItem<SyncColumn>() {
-    constructor(columnName: String, type: Class<*>) : this(columnName) {
+    constructor(columnName: String, type: KClass<*>) : this(columnName) {
         this.setType(type)
     }
 
@@ -80,50 +84,50 @@ class SyncColumn(
     /**
      * Compress string representation of the DataType to be more concise in the serialized stream
      */
-    private fun getAssemblyQualifiedName(valueType: Class<*>): String =
+    private fun getAssemblyQualifiedName(valueType: KClass<*>): String =
             when (valueType) {
-                Boolean::class.java ->
+                Boolean::class ->
                     "1"
-                Byte::class.java ->
+                Byte::class ->
                     "2"
-                Char::class.java ->
+                Char::class ->
                     "3"
-                Double::class.java ->
+                Double::class ->
                     "4"
-                Float::class.java ->
+                Float::class ->
                     "5"
-                Int::class.java ->
+                Int::class ->
                     "6"
-                Long::class.java ->
+                Long::class ->
                     "7"
-                Short::class.java ->
+                Short::class ->
                     "8"
-                UInt::class.java ->
+                UInt::class ->
                     "9"
-                ULong::class.java ->
+                ULong::class ->
                     "10"
-                UShort::class.java ->
+                UShort::class ->
                     "11"
-                ByteArray::class.java ->
+                ByteArray::class ->
                     "12"
-                Date::class.java ->
+                LocalDateTime::class ->
                     "13"
 //                 DateTimeOffset::class.java ->
 //                    "14"
-                BigDecimal::class.java ->
+                BigDecimal::class ->
                     "15"
-                UUID::class.java ->
+                Uuid::class ->
                     "16"
-                String::class.java ->
+                String::class ->
                     "17"
 //                    SByte::class.java ->
 //                        "18"
 //                    TimeSpan::class.java ->
 //                        "19"
-                CharArray::class.java ->
+                CharArray::class ->
                     "20"
                 else ->
-                    valueType.name
+                    valueType.simpleName ?: valueType.toString()
             }
 
     /**
@@ -178,7 +182,7 @@ class SyncColumn(
             }
 
     fun getDbType(): DbType =
-            DbType.values()[this.dbType]
+            DbType.entries[this.dbType]
 
     /**
      * Get auto inc values, coercing Step
@@ -222,53 +226,53 @@ class SyncColumn(
     /**
      * Get DataType from compressed string type
      */
-    fun getDataType(): Class<*> =
+    fun getDataType(): KClass<*> =
             when (this.dataType) {
                 "1" ->
-                    Boolean::class.java
+                    Boolean::class
                 "2" ->
-                    Byte::class.java
+                    Byte::class
                 "3" ->
-                    Char::class.java
+                    Char::class
                 "4" ->
-                    Double::class.java
+                    Double::class
                 "5" ->
-                    Float::class.java
+                    Float::class
                 "6" ->
-                    Int::class.java
+                    Int::class
                 "7" ->
-                    Long::class.java
+                    Long::class
                 "8" ->
-                    Short::class.java
+                    Short::class
                 "9" ->
-                    UInt::class.java
+                    UInt::class
                 "10" ->
-                    ULong::class.java
+                    ULong::class
                 "11" ->
-                    UShort::class.java
+                    UShort::class
                 "12" ->
-                    ByteArray::class.java
+                    ByteArray::class
                 "13" ->
-                    Date::class.java
+                    LocalDateTime::class
 //                "14"->
 //                    DateTimeOffset::class.java
                 "15" ->
-                    BigDecimal::class.java
+                    BigDecimal::class
                 "16" ->
-                    UUID::class.java
+                    Uuid::class
                 "17" ->
-                    String::class.java
+                    String::class
 //                "18"->
 //                    SByte::class.java
 //                "19"->
 //                    TimeSpan::class.java
                 "20" ->
-                    CharArray::class.java
+                    CharArray::class
                 else ->
-                    Class.forName(this.dataType)
+                    Any::class//KClass.forName(this.dataType)
             }
 
-    fun setType(type: Class<*>) {
+    fun setType(type: KClass<*>) {
         this.dataType = getAssemblyQualifiedName(type)
         this.dbType = coerceDbType().value
     }
@@ -278,6 +282,6 @@ class SyncColumn(
 
     companion object {
         inline fun <reified T : Any> create(columnName: String): SyncColumn =
-                SyncColumn(columnName, T::class.java)
+                SyncColumn(columnName, T::class)
     }
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumnIdentifier.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumnIdentifier.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumnIdentifier.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumnIdentifier.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumns.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumns.kt
new file mode 100644
index 0000000..4e2258e
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncColumns.kt
@@ -0,0 +1,97 @@
+package com.mimetis.dotmim.sync.set
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncColumnsSerializer::class)
+class SyncColumns() : CustomList<SyncColumn>() {
+    private val columnsDictionary = HashMap<String, SyncColumn?>()
+    private val columnsIndexDictionary = HashMap<String, Int>()
+
+    /**
+     * Column's schema
+     */
+    @Transient
+    var table: SyncTable? = null
+
+    internal constructor(items: List<SyncColumn>) : this() {
+        internalList.addAll(items)
+    }
+
+    constructor(table: SyncTable) : this() {
+        this.table = table
+    }
+
+    fun ensureColumns(table: SyncTable) {
+        this.table = table
+    }
+
+    fun getIndex(columnName: String): Int =
+        columnsIndexDictionary.getOrPut(columnName) {
+            internalList.indexOfFirst { c ->
+                c.columnName.equals(
+                    columnName,
+                    true
+                )
+            }
+        }
+
+    /**
+     * Get a Column by its name
+     */
+    operator fun get(columnName: String): SyncColumn? =
+        columnsDictionary.getOrPut(columnName) {
+            internalList.firstOrNull { c ->
+                c.columnName.equals(
+                    columnName,
+                    true
+                )
+            }
+        }
+
+    fun addAll(items: SyncColumns) = internalList.addAll(items)
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncColumnsSerializer :
+    ArrayListLikeSerializer<SyncColumns, SyncColumn>(SyncColumn.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncColumn>()
+
+    override fun deserialize(decoder: Decoder): SyncColumns {
+        val items = ArrayList<SyncColumn>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index = compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncColumns(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilter.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilter.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterJoin.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterJoin.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterJoin.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterJoin.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt
new file mode 100644
index 0000000..534eaf3
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt
@@ -0,0 +1,70 @@
+package com.mimetis.dotmim.sync.set
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncFilterJoinsSerializer::class)
+class SyncFilterJoins() : CustomList<SyncFilterJoin>() {
+
+    internal constructor(items: List<SyncFilterJoin>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Filter's schema
+     */
+    @Transient
+    var schema: SyncSet? = null
+
+    /**
+     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
+     */
+    fun ensureFilters(schema: SyncSet) {
+        this.schema = schema
+
+        this.forEach { it.ensureFilterJoin(schema) }
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncFilterJoinsSerializer : ArrayListLikeSerializer<SyncFilterJoins, SyncFilterJoin>(SyncFilterJoin.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncFilterJoin>()
+
+    override fun deserialize(decoder: Decoder): SyncFilterJoins {
+        val items = ArrayList<SyncFilterJoin>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    SyncFilterJoinsSerializer.elementSerializer.descriptor,
+                    i,
+                    SyncFilterJoinsSerializer.elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index = compositeDecoder.decodeElementIndex(SyncFilterJoinsSerializer.elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    SyncFilterJoinsSerializer.elementSerializer.descriptor,
+                    index,
+                    SyncFilterJoinsSerializer.elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncFilterJoins(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterParameter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterParameter.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterParameter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterParameter.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt
new file mode 100644
index 0000000..fe396c5
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt
@@ -0,0 +1,70 @@
+package com.mimetis.dotmim.sync.set
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncFilterParametersSerializer::class)
+class SyncFilterParameters() : CustomList<SyncFilterParameter>() {
+
+    internal constructor(items: List<SyncFilterParameter>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Filter's schema
+     */
+    @Transient
+    var schema: SyncSet? = null
+
+    /**
+     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
+     */
+    fun ensureFilters(schema: SyncSet) {
+        this.schema = schema
+
+        this.forEach { it.ensureFilterParameter(schema) }
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncFilterParametersSerializer : ArrayListLikeSerializer<SyncFilterParameters, SyncFilterParameter>(SyncFilterParameter.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncFilterParameter>()
+
+    override fun deserialize(decoder: Decoder): SyncFilterParameters {
+        val items = ArrayList<SyncFilterParameter>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    SyncFilterParametersSerializer.elementSerializer.descriptor,
+                    i,
+                    SyncFilterParametersSerializer.elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index = compositeDecoder.decodeElementIndex(SyncFilterParametersSerializer.elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    SyncFilterParametersSerializer.elementSerializer.descriptor,
+                    index,
+                    SyncFilterParametersSerializer.elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncFilterParameters(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItem.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItem.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItem.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItem.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt
new file mode 100644
index 0000000..6ea189c
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt
@@ -0,0 +1,72 @@
+package com.mimetis.dotmim.sync.set
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncFilterWhereSideItemsSerializer::class)
+class SyncFilterWhereSideItems() : CustomList<SyncFilterWhereSideItem>() {
+    internal constructor(items: List<SyncFilterWhereSideItem>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Filter's schema
+     */
+    @Transient
+    var schema: SyncSet? = null
+
+    /**
+     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
+     */
+    fun ensureFilters(schema: SyncSet) {
+        this.schema = schema
+
+        this.forEach { it.ensureFilterWhereSideItem(schema) }
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncFilterWhereSideItemsSerializer :
+    ArrayListLikeSerializer<SyncFilterWhereSideItems, SyncFilterWhereSideItem>(
+        SyncFilterWhereSideItem.serializer()
+    ) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncFilterWhereSideItem>()
+
+    override fun deserialize(decoder: Decoder): SyncFilterWhereSideItems {
+        val items = ArrayList<SyncFilterWhereSideItem>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index = compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncFilterWhereSideItems(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilters.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilters.kt
similarity index 54%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilters.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilters.kt
index c12e3ec..79f9e7f 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilters.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncFilters.kt
@@ -4,9 +4,18 @@ import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import com.mimetis.dotmim.sync.ArrayListLikeSerializer
 import com.mimetis.dotmim.sync.setup.SetupFilter
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
 
 @Serializable(with = SyncFiltersSerializer::class)
-class SyncFilters() : ArrayList<SyncFilter>() {
+class SyncFilters() : CustomList<SyncFilter>() {
+    internal constructor(items: List<SyncFilter>) : this() {
+        internalList.addAll(items)
+    }
+
     fun add(setupFilter: SetupFilter) {
         val item = SyncFilter(setupFilter.tableName, setupFilter.schemaName, schema = this.schema)
         setupFilter.parameters.forEach { s ->
@@ -64,4 +73,40 @@ class SyncFilters() : ArrayList<SyncFilter>() {
     }
 }
 
-object SyncFiltersSerializer : ArrayListLikeSerializer<SyncFilters, SyncFilter>(SyncFilter.serializer())
+@OptIn(ExperimentalSerializationApi::class)
+object SyncFiltersSerializer : ArrayListLikeSerializer<SyncFilters, SyncFilter>(SyncFilter.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncFilter>()
+
+    override fun deserialize(decoder: Decoder): SyncFilters {
+        val items = ArrayList<SyncFilter>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncFilters(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncNamedItem.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncNamedItem.kt
similarity index 95%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncNamedItem.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncNamedItem.kt
index e949ab8..4213de4 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncNamedItem.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncNamedItem.kt
@@ -50,7 +50,4 @@ abstract class SyncNamedItem<T> {
 
     override fun equals(other: Any?): Boolean =
             this.equalsByProperties(other as? T)
-
-    override fun hashCode(): Int =
-            javaClass.hashCode()
 }
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRelation.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRelation.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRelation.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRelation.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRelations.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRelations.kt
new file mode 100644
index 0000000..afea6ea
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRelations.kt
@@ -0,0 +1,78 @@
+package com.mimetis.dotmim.sync.set
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncRelationsSerializer::class)
+class SyncRelations() : CustomList<SyncRelation>() {
+    internal constructor(items: List<SyncRelation>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Relation's schema
+     */
+    @Transient
+    var schema: SyncSet? = null
+
+    constructor(schema: SyncSet) : this() {
+        this.schema = schema
+    }
+
+    /**
+     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
+     */
+    fun ensureRelations(schema: SyncSet) {
+        this.schema = schema
+        this.forEach { it.ensureRelation(schema) }
+    }
+
+    override fun clear() {
+        this.forEach { it.clear() }
+        super.clear()
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncRelationsSerializer : ArrayListLikeSerializer<SyncRelations, SyncRelation>(SyncRelation.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncRelation>()
+
+    override fun deserialize(decoder: Decoder): SyncRelations {
+        val items = ArrayList<SyncRelation>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncRelations(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRow.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRow.kt
similarity index 89%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRow.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRow.kt
index 10f5274..50c4e5d 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRow.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRow.kt
@@ -1,11 +1,12 @@
 package com.mimetis.dotmim.sync.set
 
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
 import com.mimetis.dotmim.sync.DataRowState
 import com.mimetis.dotmim.sync.PrimitiveSerializer
-import java.util.*
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializable
 class SyncRow(@Transient val length: Int = 0) {
     private var buffer: Array<@Serializable(with = PrimitiveSerializer::class) Any?> =
@@ -54,7 +55,7 @@ class SyncRow(@Transient val length: Int = 0) {
 
     fun toArray(): Array<Any?> {
         val array = Array<Any?>(this.length + 1) {}
-        System.arraycopy(this.buffer, 0, array, 1, this.length)
+        buffer.copyInto(array, 1, 0)
         array[0] = this.rowState.value
         return array
     }
@@ -68,17 +69,17 @@ class SyncRow(@Transient val length: Int = 0) {
         if (row.size != length + 1)
             throw Exception("row must contains State on position 0 and UpdateScopeId on position 1")
 
-        System.arraycopy(row, 1, buffer, 0, length)
+        row.copyInto(buffer, 0, 1)
         val drs = row[0]
         this.rowState = if (drs is DataRowState) {
             drs
         } else {
-            DataRowState.values().first { it.value == drs }
+            DataRowState.entries.first { it.value == drs }
         }
     }
 
     fun clear() {
-        Arrays.fill(buffer, null)
+        buffer.fill(null)
         //this.table = null
     }
 }
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRows.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRows.kt
new file mode 100644
index 0000000..fdd2850
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncRows.kt
@@ -0,0 +1,117 @@
+package com.mimetis.dotmim.sync.set
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.DataRowState
+import com.mimetis.dotmim.sync.SyncTypeConverter
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncRowsSerializer::class)
+class SyncRows() : CustomList<SyncRow>() {
+    @Transient
+    var table: SyncTable? = null
+
+    internal constructor(items: List<SyncRow>) : this() {
+        internalList.addAll(items)
+    }
+
+    constructor(table: SyncTable) : this() {
+        this.table = table
+    }
+
+    fun ensureRows(table: SyncTable) {
+        this.table = table
+        this.forEach { it.table = table }
+    }
+
+    /**
+     * Import a containerTable
+     */
+    fun importContainerTable(containerTable: ContainerTable, checkType: Boolean) {
+        for (row in containerTable.rows!!) {
+            val length = table!!.columns!!.size
+            val itemArray = Array<Any?>(length) {}
+
+            if (!checkType) {
+//                System.arraycopy(row, 1, itemArray, 0, length)
+                row.copyInto(itemArray, 0, 1)
+            } else {
+                // Get only writable columns
+                val columns = table!!.getMutableColumnsWithPrimaryKeys()
+
+                for (col in columns) {
+                    val value = row[col.ordinal + 1]
+                    val colDataType = col.getDataType()
+
+                    if (value == null)
+                        itemArray[col.ordinal] = null
+                    else if (value::class != colDataType)
+                        itemArray[col.ordinal] =
+                            SyncTypeConverter.tryConvertTo(value, col.getDataType())
+                    else
+                        itemArray[col.ordinal] = value
+                }
+            }
+
+            //Array.Copy(row, 1, itemArray, 0, length);
+            val state = DataRowState.entries.first { it.value == row[0] as Int }
+
+            val schemaRow = SyncRow(this.table!!, itemArray, state)
+            this.add(schemaRow)
+        }
+    }
+
+    /**
+     * Gets the inner rows for serialization
+     */
+    fun exportToContainerTable(): List<Array<Any?>> =
+        this.map { row -> row.toArray() }
+
+    override fun clear() {
+        this.forEach { it.clear() }
+        super.clear()
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncRowsSerializer : ArrayListLikeSerializer<SyncRows, SyncRow>(SyncRow.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncRow>()
+
+    override fun deserialize(decoder: Decoder): SyncRows {
+        val items = ArrayList<SyncRow>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncRows(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncSet.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncSet.kt
similarity index 98%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncSet.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncSet.kt
index a9035d1..ce8a184 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncSet.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncSet.kt
@@ -1,9 +1,8 @@
 package com.mimetis.dotmim.sync.set
 
+import com.mimetis.dotmim.sync.setup.SyncSetup
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.io.Closeable
 
 @Serializable
 class SyncSet(
@@ -24,7 +23,7 @@ class SyncSet(
      */
     @SerialName("f")
     var filters: SyncFilters
-) : Closeable {
+) : AutoCloseable {
     /**
      * Create a new SyncSet, empty
      */
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTable.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTable.kt
similarity index 95%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTable.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTable.kt
index e7f7150..cbd0325 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTable.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTable.kt
@@ -1,13 +1,13 @@
 package com.mimetis.dotmim.sync.set
 
-import android.database.Cursor
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
+import androidx.sqlite.SQLiteStatement
 import com.mimetis.dotmim.sync.DataRowState
 import com.mimetis.dotmim.sync.enumerations.SyncDirection
 import com.mimetis.dotmim.sync.sqlite.CursorHelper.getDataType
 import com.mimetis.dotmim.sync.sqlite.CursorHelper.getValue
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
 /**
  * Represents a table schema
@@ -81,16 +81,16 @@ class SyncTable(
         this.rows.ensureRows(this)
     }
 
-    fun load(cursor: Cursor, filter: ((cursor: Cursor) -> Boolean)? = null) {
-        val readerFieldCount = cursor.columnCount
-        if (readerFieldCount == 0 || cursor.count == 0)
+    fun load(cursor: SQLiteStatement, filter: ((cursor: SQLiteStatement) -> Boolean)? = null) {
+        val readerFieldCount = cursor.getColumnCount()
+        if (readerFieldCount == 0)
             return
 
-        while (cursor.moveToNext()) {
+        while (cursor.step()) {
             if (this.columns?.isEmpty() == true) {
                 for (i in 0 until readerFieldCount) {
                     val columnName = cursor.getColumnName(i)
-                    val columnType = cursor.getType(i).getDataType()
+                    val columnType = cursor.getColumnType(i).getDataType()
                     this.columns?.add(SyncColumn(columnName, columnType))
                 }
             }
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTables.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTables.kt
new file mode 100644
index 0000000..2f2aab9
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/set/SyncTables.kt
@@ -0,0 +1,103 @@
+package com.mimetis.dotmim.sync.set
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.builders.ParserName
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SyncTablesSerializer::class)
+class SyncTables() : CustomList<SyncTable>() {
+    internal constructor(items: List<SyncTable>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Table's schema
+     */
+    @Transient
+    var schema: SyncSet? = null
+
+    constructor(schema: SyncSet) : this() {
+        this.schema = schema
+    }
+
+    /**
+     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
+     */
+    fun ensureTables(schema: SyncSet) {
+        this.schema = schema
+        this.forEach { it.ensureTable(schema) }
+    }
+
+    override fun clear() {
+        this.forEach { it.clear() }
+        super.clear()
+    }
+
+    override fun add(element: SyncTable): Boolean {
+        element.schema = schema
+        return super.add(element)
+    }
+
+    /**
+     * Get a table by its name
+     */
+    operator fun get(tableName: String, schemaName: String): SyncTable? {
+        if (tableName.isBlank())
+            throw Exception("`tableName' parameter in empty ($tableName)")
+
+        val parser = ParserName.parse(tableName)
+        val tblName = parser.objectName
+
+        val scn = if (schemaName.isBlank()) "" else schemaName
+        val table = this.firstOrNull { innerTable ->
+            val innerTableSchemaName = if (innerTable.schemaName.isBlank()) "" else innerTable.schemaName
+            return@firstOrNull innerTable.tableName.equals(tblName, true) && innerTableSchemaName.equals(scn, true)
+
+        }
+        return table
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SyncTablesSerializer : ArrayListLikeSerializer<SyncTables, SyncTable>(SyncTable.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncTable>()
+
+    override fun deserialize(decoder: Decoder): SyncTables {
+        val items = ArrayList<SyncTable>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SyncTables(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/DbType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/DbType.kt
similarity index 85%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/DbType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/DbType.kt
index 7009a26..3b1f121 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/DbType.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/DbType.kt
@@ -1,10 +1,26 @@
 package com.mimetis.dotmim.sync.setup
 
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
 import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+class DbTypeSerializer : KSerializer<DbType> {
+    private var values: Map<Int, DbType>? = null
 
-class DbTypeSerializer : EnumByValueSerializer<DbType>()
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.DbType", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: DbType) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): DbType =
+        (values
+            ?: DbType.entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
 
 @Serializable(with = DbTypeSerializer::class)
 enum class DbType(override val value: Int): EnumWithValue {
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/Join.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/Join.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/Join.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/Join.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupColumns.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupColumns.kt
new file mode 100644
index 0000000..0619706
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupColumns.kt
@@ -0,0 +1,56 @@
+package com.mimetis.dotmim.sync.setup
+
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.builtins.serializer
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.set.CustomList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SetupColumnsSerializer::class)
+class SetupColumns() : CustomList<String>() {
+    internal constructor(items: List<String>) : this() {
+        internalList.addAll(items)
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SetupColumnsSerializer : ArrayListLikeSerializer<SetupColumns, String>(String.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<String>()
+
+    override fun deserialize(decoder: Decoder): SetupColumns {
+        val items = ArrayList<String>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SetupColumns(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilter.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilter.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterJoin.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterJoin.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterJoin.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterJoin.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterParameter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterParameter.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterParameter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterParameter.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterWhere.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterWhere.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilterWhere.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilterWhere.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilters.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilters.kt
new file mode 100644
index 0000000..75a5cdc
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupFilters.kt
@@ -0,0 +1,55 @@
+package com.mimetis.dotmim.sync.setup
+
+import kotlinx.serialization.Serializable
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.set.CustomList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+@Serializable(with = SetupFiltersSerializer::class)
+class SetupFilters() : CustomList<SetupFilter>() {
+    internal constructor(items: List<SetupFilter>) : this() {
+        internalList.addAll(items)
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SetupFiltersSerializer : ArrayListLikeSerializer<SetupFilters, SetupFilter>(SetupFilter.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SetupFilter>()
+
+    override fun deserialize(decoder: Decoder): SetupFilters {
+        val items = ArrayList<SetupFilter>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SetupFilters(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupTable.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupTable.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupTable.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupTable.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupTables.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupTables.kt
new file mode 100644
index 0000000..f8b5cfa
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SetupTables.kt
@@ -0,0 +1,74 @@
+package com.mimetis.dotmim.sync.setup
+
+import com.mimetis.dotmim.sync.ArrayListLikeSerializer
+import com.mimetis.dotmim.sync.set.CustomList
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.listSerialDescriptor
+import kotlinx.serialization.encoding.CompositeDecoder
+import kotlinx.serialization.encoding.Decoder
+
+/**
+ * Represents a list of tables to be added to the sync process
+ */
+@Serializable(with = SetupTablesSerializer::class)
+class SetupTables() : CustomList<SetupTable>() {
+    internal constructor(items: List<SetupTable>) : this() {
+        internalList.addAll(items)
+    }
+
+    /**
+     * Get a table by its name
+     */
+    operator fun get(tableName: String, schemaName: String): SetupTable? {
+        if (tableName.isBlank())
+            throw Exception("`tableName' parameter in empty ($tableName)")
+
+        val scn = if (schemaName.isBlank()) "" else schemaName
+        val table = this.firstOrNull { innerTable ->
+            val innerTableSchemaName = if (innerTable.schemaName.isBlank()) "" else innerTable.schemaName
+            return@firstOrNull innerTable.tableName.equals(tableName, true) && innerTableSchemaName.equals(scn, true)
+
+        }
+        return table
+    }
+}
+
+@OptIn(ExperimentalSerializationApi::class)
+object SetupTablesSerializer : ArrayListLikeSerializer<SetupTables, SetupTable>(SetupTable.serializer()) {
+    override val descriptor: SerialDescriptor = listSerialDescriptor<SetupTable>()
+
+    override fun deserialize(decoder: Decoder): SetupTables {
+        val items = ArrayList<SetupTable>()
+
+        val compositeDecoder = decoder.beginStructure(descriptor)
+
+        if (compositeDecoder.decodeSequentially()) {
+            val size = compositeDecoder.decodeCollectionSize(descriptor)
+            for (i in 0 until size) {
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    i,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        } else {
+            while (true) {
+                val index =
+                    compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
+                if (index == CompositeDecoder.DECODE_DONE) break
+                val element = compositeDecoder.decodeSerializableElement(
+                    elementSerializer.descriptor,
+                    index,
+                    elementSerializer
+                )
+                items.add(element)
+            }
+        }
+        compositeDecoder.endStructure(descriptor)
+
+        return SetupTables(items)
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SyncSetup.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SyncSetup.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SyncSetup.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/setup/SyncSetup.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt
new file mode 100644
index 0000000..62a7f2b
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt
@@ -0,0 +1,33 @@
+package com.mimetis.dotmim.sync.sqlite
+
+import androidx.sqlite.SQLITE_DATA_BLOB
+import androidx.sqlite.SQLITE_DATA_FLOAT
+import androidx.sqlite.SQLITE_DATA_INTEGER
+import androidx.sqlite.SQLITE_DATA_NULL
+import androidx.sqlite.SQLITE_DATA_TEXT
+import androidx.sqlite.SQLiteStatement
+import kotlin.reflect.KClass
+
+object CursorHelper {
+    fun SQLiteStatement.getValue(columnIndex: Int): Any? =
+        if (this.isNull(columnIndex))
+            null
+    else
+            when (this.getColumnType(columnIndex)) {
+                SQLITE_DATA_NULL -> null
+                SQLITE_DATA_INTEGER -> this.getInt(columnIndex)
+                SQLITE_DATA_FLOAT -> this.getDouble(columnIndex)
+                SQLITE_DATA_TEXT -> this.getText(columnIndex)
+                SQLITE_DATA_BLOB -> this.getBlob(columnIndex)
+                else -> null
+            }
+
+    fun Int.getDataType(): KClass<*> =
+            when (this) {
+                SQLITE_DATA_INTEGER -> Long::class
+                SQLITE_DATA_TEXT -> String::class
+                SQLITE_DATA_FLOAT -> Double::class
+                SQLITE_DATA_BLOB -> ByteArray::class
+                else -> Any::class
+            }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteBuilder.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteBuilder.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteBuilder.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt
similarity index 88%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt
index 8c8c112..2cc132f 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteDbMetadata.kt
@@ -3,11 +3,11 @@ package com.mimetis.dotmim.sync.sqlite
 import com.mimetis.dotmim.sync.builders.DbMetadata
 import com.mimetis.dotmim.sync.set.SyncColumn
 import com.mimetis.dotmim.sync.setup.DbType
-import java.util.*
+import kotlin.reflect.KClass
 
 class SqliteDbMetadata : DbMetadata() {
     override fun isValid(columnDefinition: SyncColumn): Boolean {
-        var typeName = columnDefinition.originalTypeName.lowercase(Locale.getDefault())
+        var typeName = columnDefinition.originalTypeName.lowercase()
 
         if (typeName.contains("("))
             typeName = typeName.substring(0, typeName.indexOf("("))
@@ -43,7 +43,7 @@ class SqliteDbMetadata : DbMetadata() {
         if (tn.contains("("))
             tn = tn.substring(0, typeName.indexOf("("))
 
-        when (tn.lowercase(Locale.getDefault())) {
+        when (tn.lowercase()) {
             "bit",
             "integer",
             "bigint" ->
@@ -66,16 +66,16 @@ class SqliteDbMetadata : DbMetadata() {
         throw Exception("this type name $tn is not supported")
     }
 
-    override fun validateType(ownerType: Any): Class<*> {
+    override fun validateType(ownerType: Any): KClass<*> {
         return when (ownerType as SqliteType) {
             SqliteType.Integer ->
-                Long::class.java
+                Long::class
             SqliteType.Real ->
-                Double::class.java
+                Double::class
             SqliteType.Text ->
-                String::class.java
+                String::class
             SqliteType.Blob ->
-                Any::class.java
+                Any::class
             else ->
                 throw Exception("this DbType $ownerType is not supported")
         }
@@ -86,7 +86,7 @@ class SqliteDbMetadata : DbMetadata() {
         if (tn.contains("("))
             tn = tn.substring(0, typeName.indexOf("("))
 
-        when (tn.lowercase(Locale.getDefault())) {
+        when (tn.lowercase()) {
             "bit" ->
                 return DbType.Boolean
             "integer",
@@ -116,7 +116,7 @@ class SqliteDbMetadata : DbMetadata() {
             false
 
     override fun isNumericType(typeName: String): Boolean {
-        var tn = typeName.lowercase(Locale.getDefault())
+        var tn = typeName.lowercase()
 
         if (tn.contains("("))
             tn = typeName.substring(0, tn.indexOf("("))
@@ -126,12 +126,12 @@ class SqliteDbMetadata : DbMetadata() {
     }
 
     override fun isTextType(typeName: String): Boolean {
-        val tn = typeName.lowercase(Locale.getDefault())
+        val tn = typeName.lowercase()
         return tn == "text"
     }
 
     override fun supportScale(typeName: String): Boolean {
-        val tn = typeName.lowercase(Locale.getDefault())
+        val tn = typeName.lowercase()
         return tn == "numeric" || tn == "decimal" || tn == "real" || tn == "flot"
     }
 
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteManagementUtils.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteManagementUtils.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteManagementUtils.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteManagementUtils.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt
similarity index 63%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt
index 7042ecb..7f84f8b 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteQueryWrapper.kt
@@ -1,12 +1,12 @@
 package com.mimetis.dotmim.sync.sqlite
 
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import android.database.sqlite.SQLiteStatement
-import java.io.Closeable
-import java.math.BigDecimal
-import java.text.SimpleDateFormat
-import java.util.*
+import androidx.sqlite.SQLiteConnection
+import androidx.sqlite.SQLiteStatement
+import com.ionspin.kotlin.bignum.decimal.BigDecimal
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.format.DateTimeFormat
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
 
 /**
  * Wrapper to cache sql-query building and executing process
@@ -29,11 +29,12 @@ import java.util.*
  * @param dateFormat SimpleDateFormat instance to format Date values
  * @param queryBuilder Function to form sql query. Called only once on the first call
  */
+@OptIn(ExperimentalUuidApi::class)
 class SqliteQueryWrapper(
-    private val database: SQLiteDatabase,
-    private val dateFormat: SimpleDateFormat,
+    private val database: SQLiteConnection,
+    private val dateFormat: DateTimeFormat<LocalDateTime>,
     private val queryBuilder: () -> String
-) : Closeable {
+) : AutoCloseable {
     private var sql: String = ""
     private var statement: SQLiteStatement? = null
     private var order: List<String>? = null
@@ -47,16 +48,18 @@ class SqliteQueryWrapper(
 
         if (statement == null) {
             processSql(sql).apply {
-                statement = database.compileStatement(first)
+                statement = database.prepare(first)
                 order = second
             }
         } else {
+            statement?.reset()
             statement?.clearBindings()
         }
 
-        bindParameters(parameters)
+        if (statement != null && order != null)
+            bindParameters(statement!!, order!!, parameters)
 
-        statement?.execute()
+        statement?.step()
 
         return getChanges()
     }
@@ -65,12 +68,14 @@ class SqliteQueryWrapper(
      * Execute query with parameters
      * @return Cursor instance to manually handle query results (e.g. within SELECT query)
      */
-    fun executeCursor(parameters: Map<String, Any?> = emptyMap()): Cursor {
+    fun executeCursor(parameters: Map<String, Any?> = emptyMap()): SQLiteStatement {
         ensureSqlQuery()
 
         val result = processSql(sql)
 
-        return database.rawQuery(result.first, result.second.map { parameters[it]?.toString() }.toTypedArray())
+        return database.prepare(result.first).apply {
+            bindParameters(this, result.second, parameters)
+        }
     }
 
     private fun ensureSqlQuery() {
@@ -104,30 +109,34 @@ class SqliteQueryWrapper(
         return Pair(sql, bindOrder)
     }
 
-    private fun bindParameters(parameters: Map<String, Any?>) {
+    private fun bindParameters(
+        sqlStatement: SQLiteStatement,
+        parametersOrder: List<String>,
+        parameters: Map<String, Any?>
+    ) {
         var index = 1
-        order?.forEach {
+        parametersOrder.forEach {
             when (val value = parameters[it]) {
-                null, is Unit -> statement?.bindNull(index++)
-                is String -> statement?.bindString(index++, value)
-                is Byte -> statement?.bindLong(index++, value.toLong())
-                is Int -> statement?.bindLong(index++, value.toLong())
-                is Long -> statement?.bindLong(index++, value)
-                is Boolean -> statement?.bindLong(index++, if (value) 1 else 0)
-                is ByteArray -> statement?.bindBlob(index++, value)
-                is Double -> statement?.bindDouble(index++, value)
-                is Float -> statement?.bindDouble(index++, value.toDouble())
-                is BigDecimal -> statement?.bindDouble(index++, value.toDouble())
-                is UUID -> statement?.bindString(index++, value.toString().uppercase())
-                is Date -> statement?.bindString(index++, dateFormat.format(value))
-                else -> statement?.bindString(index++, value.toString())
+                null, is Unit -> sqlStatement.bindNull(index++)
+                is String -> sqlStatement.bindText(index++, value)
+                is Byte -> sqlStatement.bindLong(index++, value.toLong())
+                is Int -> sqlStatement.bindLong(index++, value.toLong())
+                is Long -> sqlStatement.bindLong(index++, value)
+                is Boolean -> sqlStatement.bindLong(index++, if (value) 1 else 0)
+                is ByteArray -> sqlStatement.bindBlob(index++, value)
+                is Double -> sqlStatement.bindDouble(index++, value)
+                is Float -> sqlStatement.bindDouble(index++, value.toDouble())
+                is BigDecimal -> sqlStatement.bindDouble(index++, value.doubleValue(false))
+                is Uuid -> sqlStatement.bindText(index++, value.toString().uppercase())
+                is LocalDateTime -> sqlStatement.bindText(index++, dateFormat.format(value))
+                else -> sqlStatement.bindText(index++, value.toString())
             }
         }
     }
 
     private fun getChanges() =
-        database.rawQuery("SELECT changes()", null).use { cursor ->
-            if (cursor.moveToNext())
+        database.prepare("SELECT changes()").use { cursor ->
+            if (cursor.step())
                 cursor.getInt(0)
             else
                 0
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt
new file mode 100644
index 0000000..9c962ec
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt
@@ -0,0 +1,195 @@
+package com.mimetis.dotmim.sync.sqlite
+
+import androidx.sqlite.SQLiteConnection
+import androidx.sqlite.SQLiteStatement
+import androidx.sqlite.execSQL
+import com.mimetis.dotmim.sync.SyncVersion
+import com.mimetis.dotmim.sync.builders.DbScopeBuilder
+import com.mimetis.dotmim.sync.scopes.ScopeInfo
+import com.mimetis.dotmim.sync.set.SyncSet
+import com.mimetis.dotmim.sync.setup.SyncSetup
+import kotlinx.serialization.json.Json
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalUuidApi::class)
+class SqliteScopeBuilder(
+    scopeInfoTableName: String,
+    private val database: SQLiteConnection
+) : DbScopeBuilder(scopeInfoTableName) {
+
+    private val json = Json {
+        ignoreUnknownKeys = true
+        isLenient = true
+    }
+
+    override fun existsScopeInfoTable(): Boolean =
+        database.prepare(
+            "SELECT count(*) FROM sqlite_master WHERE type='table' AND name='${scopeInfoTableName.unquoted()}'"
+        ).use { cursor ->
+            cursor.step() && cursor.getInt(0) > 0
+        }
+
+
+    override fun createScopeInfoTable() {
+        database.execSQL(
+            """CREATE TABLE ${scopeInfoTableName.unquoted()}(
+                         sync_scope_id blob NOT NULL PRIMARY KEY,
+                         sync_scope_name text NOT NULL,
+                         sync_scope_schema text NULL,
+                         sync_scope_setup text NULL,
+                         sync_scope_version text NULL,
+                         scope_last_server_sync_timestamp integer NULL,
+                         scope_last_sync_timestamp integer NULL,
+                         scope_last_sync_duration integer NULL,
+                         scope_last_sync datetime NULL
+                        )"""
+        )
+    }
+
+    override fun getAllScopes(scopeName: String): MutableList<ScopeInfo> =
+        database.prepare(
+            """SELECT sync_scope_id
+                            , sync_scope_name
+                            , sync_scope_schema
+                            , sync_scope_setup
+                            , sync_scope_version
+                            , scope_last_sync
+                            , scope_last_server_sync_timestamp
+                            , scope_last_sync_timestamp
+                            , scope_last_sync_duration
+                            FROM ${scopeInfoTableName.unquoted()}
+                            WHERE sync_scope_name = ?"""
+        ).use { cursor ->
+            cursor.bindText(1, scopeName)
+            ArrayList<ScopeInfo>().apply {
+                while (cursor.step()) {
+                    add(readScope(cursor, json))
+                }
+            }
+        }
+
+    override fun existsScopeInfo(scopeId: Uuid): Boolean =
+        database.prepare(
+            "Select count(*) from ${scopeInfoTableName.unquoted()} where sync_scope_id=?"
+        ).use { cursor ->
+            cursor.bindText(1, scopeId.toString())
+            cursor.step() && cursor.getInt(0) > 0
+        }
+
+    override fun insertScope(scopeInfo: ScopeInfo): ScopeInfo {
+        database.prepare(
+            "Insert into ${scopeInfoTableName.unquoted()} (sync_scope_name, sync_scope_schema, sync_scope_setup, sync_scope_version, scope_last_sync, scope_last_sync_duration, scope_last_server_sync_timestamp, scope_last_sync_timestamp, sync_scope_id) values(?,?,?,?,?,?,?,?,?)"
+        ).use {
+            it.bindText(1, scopeInfo.name)
+            if (scopeInfo.schema != null)
+                it.bindText(2, json.encodeToString(scopeInfo.schema))
+            else
+                it.bindNull(2)
+            if (scopeInfo.setup != null)
+                it.bindText(3, json.encodeToString(scopeInfo.setup))
+            else
+                it.bindNull(3)
+            it.bindText(4, scopeInfo.version)
+            if (scopeInfo.lastSync != null)
+                it.bindLong(5, scopeInfo.lastSync!!)
+            else
+                it.bindNull(5)
+            it.bindLong(6, scopeInfo.lastSyncDuration)
+            if (scopeInfo.lastServerSyncTimestamp != null)
+                it.bindLong(7, scopeInfo.lastServerSyncTimestamp!!)
+            else
+                it.bindNull(7)
+            if (scopeInfo.lastSyncTimestamp != null)
+                it.bindLong(8, scopeInfo.lastSyncTimestamp!!)
+            else
+                it.bindNull(8)
+            it.bindText(9, scopeInfo.id.toString())
+
+            it.step()
+        }
+        return getAllScopes(scopeInfo.name).first()
+    }
+
+    override fun updateScope(scopeInfo: ScopeInfo): ScopeInfo {
+        database.prepare(
+            "Update ${scopeInfoTableName.unquoted()} set sync_scope_name=?, sync_scope_schema=?, sync_scope_setup=?, sync_scope_version=?, scope_last_sync=?, scope_last_server_sync_timestamp=?, scope_last_sync_timestamp=?, scope_last_sync_duration=? where sync_scope_id=?"
+        ).use {
+            it.bindText(1, scopeInfo.name)
+            if (scopeInfo.schema != null)
+                it.bindText(2, json.encodeToString(scopeInfo.schema))
+            else
+                it.bindNull(2)
+            if (scopeInfo.setup != null)
+                it.bindText(3, json.encodeToString(scopeInfo.setup))
+            else
+                it.bindNull(3)
+            it.bindText(4, scopeInfo.version)
+            if (scopeInfo.lastSync != null)
+                it.bindLong(5, scopeInfo.lastSync!!)
+            else
+                it.bindNull(5)
+            if (scopeInfo.lastServerSyncTimestamp != null)
+                it.bindLong(6, scopeInfo.lastServerSyncTimestamp!!)
+            else
+                it.bindNull(6)
+            if (scopeInfo.lastSyncTimestamp != null)
+                it.bindLong(7, scopeInfo.lastSyncTimestamp!!)
+            else
+                it.bindNull(7)
+            it.bindLong(8, scopeInfo.lastSyncDuration)
+            it.bindText(9, scopeInfo.id.toString())
+
+            it.step()
+        }
+        return getAllScopes(scopeInfo.name).first()
+    }
+
+    override fun getLocalTimestamp(): Long =
+        database.prepare("Select " + SqliteTableBuilder.TimestampValue).use { cursor ->
+            if (cursor.step())
+                cursor.getLong(0)
+            else
+                0L
+        }
+
+    override fun dropScopeInfoTable() {
+        database.execSQL("DROP Table ${scopeInfoTableName.unquoted()}")
+    }
+
+    private fun readScope(cursor: SQLiteStatement, json: Json): ScopeInfo {
+        val columns = cursor.getColumnNames()
+        return ScopeInfo(
+            id = Uuid.parse(cursor.getText(columns.indexOf("sync_scope_id"))),
+            name = cursor.getText(columns.indexOf("sync_scope_name")),
+            schema = if (cursor.isNull(columns.indexOf("sync_scope_schema")))
+                null
+            else json.decodeFromString<SyncSet>(cursor.getText(columns.indexOf("sync_scope_schema"))),
+            setup = if (cursor.isNull(columns.indexOf("sync_scope_setup")))
+                null
+            else
+                json.decodeFromString<SyncSetup>(cursor.getText(columns.indexOf("sync_scope_setup"))),
+            version = if (cursor.isNull(columns.indexOf("sync_scope_version")))
+                SyncVersion.current
+            else
+                cursor.getText(columns.indexOf("sync_scope_version")),
+            lastSync = if (cursor.isNull(columns.indexOf("scope_last_sync")))
+                null
+            else
+                cursor.getLong(columns.indexOf("scope_last_sync")),
+            lastServerSyncTimestamp = if (cursor.isNull(columns.indexOf("scope_last_server_sync_timestamp")))
+                null
+            else
+                cursor.getLong(columns.indexOf("scope_last_server_sync_timestamp")),
+            lastSyncTimestamp = if (cursor.isNull(columns.indexOf("scope_last_sync_timestamp")))
+                null
+            else
+                cursor.getLong(columns.indexOf("scope_last_sync_timestamp")),
+            lastSyncDuration = if (cursor.isNull(columns.indexOf("scope_last_sync_duration")))
+                0
+            else
+                cursor.getLong(columns.indexOf("scope_last_sync_duration")),
+            isNewScope = false
+        )
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt
similarity index 89%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt
index 33c45c0..a2d744b 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncAdapter.kt
@@ -1,9 +1,8 @@
 package com.mimetis.dotmim.sync.sqlite
 
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import android.os.Build
-import android.util.Base64
+import androidx.sqlite.SQLiteConnection
+import androidx.sqlite.SQLiteStatement
+import androidx.sqlite.execSQL
 import com.mimetis.dotmim.sync.DbSyncAdapter
 import com.mimetis.dotmim.sync.builders.ParserName
 import com.mimetis.dotmim.sync.set.SyncColumn
@@ -11,20 +10,28 @@ import com.mimetis.dotmim.sync.set.SyncRow
 import com.mimetis.dotmim.sync.set.SyncTable
 import com.mimetis.dotmim.sync.setup.DbType
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.text.SimpleDateFormat
-import java.util.*
-
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.format.FormatStringsInDatetimeFormats
+import kotlinx.datetime.format.byUnicodePattern
+import kotlin.io.encoding.Base64
+import kotlin.io.encoding.ExperimentalEncodingApi
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalUuidApi::class, ExperimentalEncodingApi::class,
+    FormatStringsInDatetimeFormats::class
+)
 class SqliteSyncAdapter(
     tableDescription: SyncTable,
     private val tableName: ParserName,
     private val trackingName: ParserName,
     setup: SyncSetup,
-    private val database: SQLiteDatabase
+    private val database: SQLiteConnection
 ) : DbSyncAdapter(tableDescription, setup) {
-    private val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
+    private val dateFormat = LocalDateTime.Format { byUnicodePattern("yyyy-MM-dd HH:mm:ss") }
     private var getSelectChangesSql = ""
 
-    override fun getSelectInitializedChanges(): Cursor {
+    override fun getSelectInitializedChanges(): SQLiteStatement {
         val stringBuilder = StringBuilder("SELECT ")
         for (pkColumn in this.tableDescription.getPrimaryKeysColumns()) {
             val columnName = ParserName.parse(pkColumn).quoted().toString()
@@ -42,10 +49,10 @@ class SqliteSyncAdapter(
         }
         stringBuilder.appendLine("FROM ${tableName.quoted()} [base]")
 
-        return database.rawQuery(stringBuilder.toString(), null)
+        return database.prepare(stringBuilder.toString())
     }
 
-    override fun getSelectChanges(lastTimestamp: Long?): Cursor {
+    override fun getSelectChanges(lastTimestamp: Long?): SQLiteStatement {
         if (getSelectChangesSql.isEmpty()) {
             val stringBuilder = StringBuilder("SELECT ")
             for (pkColumn in this.tableDescription.getPrimaryKeysColumns()) {
@@ -78,12 +85,14 @@ class SqliteSyncAdapter(
             // Looking at discussion https://github.com/Mimetis/Dotmim.Sync/discussions/453, trying to remove ([side].[update_scope_id] <> @sync_scope_id)
             // since we are sure that sqlite will never be a server side database
 
-            stringBuilder.appendLine("WHERE ([side].[timestamp] > @sync_min_timestamp AND [side].[update_scope_id] IS NULL)")
+            stringBuilder.appendLine("WHERE ([side].[timestamp] > ? AND [side].[update_scope_id] IS NULL)")
 
             getSelectChangesSql = stringBuilder.toString()
         }
 
-        return database.rawQuery(getSelectChangesSql, arrayOf((lastTimestamp ?: 0).toString()))
+        return database.prepare(getSelectChangesSql).apply {
+            bindLong(1, lastTimestamp ?: 0)
+        }
     }
 
     private val getSelectRowQuery: SqliteQueryWrapper = SqliteQueryWrapper(
@@ -125,7 +134,7 @@ class SqliteSyncAdapter(
         return@SqliteQueryWrapper stringBuilder.toString()
     }
 
-    override fun getSelectRow(primaryKeyRow: SyncRow): Cursor {
+    override fun getSelectRow(primaryKeyRow: SyncRow): SQLiteStatement {
         val parameters = mutableMapOf<String, Any?>()
         fillParametersFromColumns(
             parameters,
@@ -237,7 +246,7 @@ class SqliteSyncAdapter(
     }
 
     override fun deleteRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -334,7 +343,7 @@ class SqliteSyncAdapter(
     }
 
     override fun initializeRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -394,35 +403,35 @@ class SqliteSyncAdapter(
             empty = "\n, "
         }
 
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-            // No support for "ON CONFLICT" in Android < 11 because this is supported in Sqlite after 3.24
-            stringBuilder.appendLine("INSERT OR REPLACE INTO ${tableName.quoted()}")
-            stringBuilder.appendLine("(${stringBuilderArguments})")
-            stringBuilder.appendLine("SELECT $stringBuilderParameters ")
-            stringBuilder.appendLine("FROM (SELECT ${stringBuilderParametersValues}) as [c]")
-            stringBuilder.appendLine("LEFT JOIN ${trackingName.quoted()} AS [side] ON $str1")
-            stringBuilder.appendLine("LEFT JOIN ${tableName.quoted()} AS [base] ON $str2")
-
-            stringBuilder.appendLine(
-                "WHERE (${
-                    SqliteManagementUtils.whereColumnAndParameters(
-                        this.tableDescription.primaryKeys,
-                        "[base]"
-                    )
-                } "
-            )
-            stringBuilder.appendLine("AND ([side].[timestamp] < @sync_min_timestamp OR [side].[update_scope_id] = @sync_scope_id)) ")
-            stringBuilder.appendLine(
-                "OR (${
-                    SqliteManagementUtils.whereColumnIsNull(
-                        this.tableDescription.primaryKeys,
-                        "[base]"
-                    )
-                } "
-            )
-            stringBuilder.appendLine("AND ([side].[timestamp] < @sync_min_timestamp OR [side].[timestamp] IS NULL)) ")
-            stringBuilder.appendLine("OR @sync_force_write = 1;")
-        } else {
+//        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
+//            // No support for "ON CONFLICT" in Android < 11 because this is supported in Sqlite after 3.24
+//            stringBuilder.appendLine("INSERT OR REPLACE INTO ${tableName.quoted()}")
+//            stringBuilder.appendLine("(${stringBuilderArguments})")
+//            stringBuilder.appendLine("SELECT $stringBuilderParameters ")
+//            stringBuilder.appendLine("FROM (SELECT ${stringBuilderParametersValues}) as [c]")
+//            stringBuilder.appendLine("LEFT JOIN ${trackingName.quoted()} AS [side] ON $str1")
+//            stringBuilder.appendLine("LEFT JOIN ${tableName.quoted()} AS [base] ON $str2")
+//
+//            stringBuilder.appendLine(
+//                "WHERE (${
+//                    SqliteManagementUtils.whereColumnAndParameters(
+//                        this.tableDescription.primaryKeys,
+//                        "[base]"
+//                    )
+//                } "
+//            )
+//            stringBuilder.appendLine("AND ([side].[timestamp] < @sync_min_timestamp OR [side].[update_scope_id] = @sync_scope_id)) ")
+//            stringBuilder.appendLine(
+//                "OR (${
+//                    SqliteManagementUtils.whereColumnIsNull(
+//                        this.tableDescription.primaryKeys,
+//                        "[base]"
+//                    )
+//                } "
+//            )
+//            stringBuilder.appendLine("AND ([side].[timestamp] < @sync_min_timestamp OR [side].[timestamp] IS NULL)) ")
+//            stringBuilder.appendLine("OR @sync_force_write = 1;")
+//        } else {
             // create update statement without PK
             var emptyUpdate = ""
             var columnsToUpdate = false
@@ -473,7 +482,7 @@ class SqliteSyncAdapter(
                 stringBuilder.append(stringBuilderUpdateSet).appendLine(";")
             } else
                 stringBuilder.appendLine(" ON CONFLICT (${primaryKeys}) DO NOTHING; ")
-        }
+//        }
 
         return@SqliteQueryWrapper stringBuilder.toString()
     }
@@ -502,7 +511,7 @@ class SqliteSyncAdapter(
     }
 
     override fun updateRow(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         syncTimeStamp: Long?,
         isDeleted: Boolean,
         forceWrite: Boolean,
@@ -566,7 +575,7 @@ class SqliteSyncAdapter(
     }
 
     override fun updateMetadata(
-        scopeId: UUID?,
+        scopeId: Uuid?,
         isDeleted: Boolean,
         forceWrite: Boolean,
         row: SyncRow
@@ -588,8 +597,8 @@ class SqliteSyncAdapter(
     override fun deleteMetadata(timestamp: Long): Int {
         database.execSQL("DELETE FROM ${trackingName.quoted()} WHERE [timestamp] < $timestamp;")
 
-        return database.rawQuery("SELECT changes()", null).use { cursor ->
-            if (cursor.moveToNext())
+        return database.prepare("SELECT changes()").use { cursor ->
+            if (cursor.step())
                 cursor.getInt(0)
             else
                 0
@@ -651,10 +660,10 @@ class SqliteSyncAdapter(
         sqliteMetadataQuery.close()
     }
 
-    override fun getSelectInitializedChangesWithFilters(): Cursor =
+    override fun getSelectInitializedChangesWithFilters(): SQLiteStatement =
         getSelectInitializedChanges()
 
-    override fun getSelectChangesWithFilters(lastTimestamp: Long?): Cursor =
+    override fun getSelectChangesWithFilters(lastTimestamp: Long?): SQLiteStatement =
         getSelectChanges(lastTimestamp)
 
     private fun fillParametersFromColumns(
@@ -683,7 +692,7 @@ class SqliteSyncAdapter(
 
         return when (column.getDbType()) {
             DbType.Binary ->
-                Base64.decode(value.toString(), Base64.NO_WRAP)
+                Base64.decode(value.toString())
             DbType.DateTime ->
 //                dateFormat.parse(value.toString().replace("T", " "))
                 value.toString().replace("T", " ")
@@ -699,7 +708,7 @@ class SqliteSyncAdapter(
 
         return when (column.getDbType()) {
             DbType.Binary ->
-                "X'" + Base64.decode(value.toString(), Base64.NO_WRAP)
+                "X'" + Base64.decode(value.toString())
                     .joinToString("") {
                         val x = it.toString(16)
                         if (x.length < 2)
@@ -707,7 +716,7 @@ class SqliteSyncAdapter(
                         else
                             x
                     }
-                    .uppercase(Locale.getDefault()) + "'"
+                    .uppercase() + "'"
             DbType.DateTime ->
                 value.toString().replace("T", " ")
             DbType.Guid ->
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt
similarity index 86%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt
index 554b6bb..bb4709f 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteSyncProvider.kt
@@ -1,16 +1,19 @@
 package com.mimetis.dotmim.sync.sqlite
 
-import android.database.sqlite.SQLiteOpenHelper
+import androidx.sqlite.SQLiteConnection
 import com.mimetis.dotmim.sync.CoreProvider
 import com.mimetis.dotmim.sync.DbSyncAdapter
-import com.mimetis.dotmim.sync.builders.*
+import com.mimetis.dotmim.sync.builders.DbBuilder
+import com.mimetis.dotmim.sync.builders.DbMetadata
+import com.mimetis.dotmim.sync.builders.DbScopeBuilder
+import com.mimetis.dotmim.sync.builders.DbTableBuilder
+import com.mimetis.dotmim.sync.builders.ParserName
 import com.mimetis.dotmim.sync.set.SyncTable
 import com.mimetis.dotmim.sync.setup.SyncSetup
 
 class SqliteSyncProvider(
-    helper: SQLiteOpenHelper
+    private val database: SQLiteConnection
 ) : CoreProvider() {
-    private val database = helper.writableDatabase
     private lateinit var metadata: DbMetadata
     override val supportBulkOperations: Boolean
         get() = false
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt
similarity index 93%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt
index 368e5d1..c63807c 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteTableBuilder.kt
@@ -1,6 +1,7 @@
 package com.mimetis.dotmim.sync.sqlite
 
-import android.database.sqlite.SQLiteDatabase
+import androidx.sqlite.SQLiteConnection
+import androidx.sqlite.execSQL
 import com.mimetis.dotmim.sync.builders.DbTableBuilder
 import com.mimetis.dotmim.sync.builders.DbTriggerType
 import com.mimetis.dotmim.sync.builders.ParserName
@@ -10,23 +11,21 @@ import com.mimetis.dotmim.sync.set.SyncColumn
 import com.mimetis.dotmim.sync.set.SyncTable
 import com.mimetis.dotmim.sync.setup.DbType
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
-import kotlin.collections.ArrayList
 
 class SqliteTableBuilder(
     tableDescription: SyncTable,
     tableName: ParserName,
     trackingTableName: ParserName,
     setup: SyncSetup,
-    private val database: SQLiteDatabase
+    private val database: SQLiteConnection
 ) : DbTableBuilder(tableDescription, tableName, trackingTableName, setup) {
     override fun existsTable(): Boolean {
         val tbl = this.tableName.unquoted().toString()
-        database.rawQuery(
-            "select count(name) from sqlite_master where name = ? AND type='table'",
-            arrayOf(tbl)
+        database.prepare(
+            "select count(name) from sqlite_master where name = ? AND type='table'"
         ).use { cursor ->
-            return cursor.moveToNext() && cursor.getInt(0) > 0
+            cursor.bindText(1, tbl)
+            return cursor.step() && cursor.getInt(0) > 0
         }
     }
 
@@ -70,13 +69,13 @@ class SqliteTableBuilder(
     override fun getPrimaryKeys(): List<SyncColumn> {
         val unquotedTableName = this.tableName.unquoted().toString()
         val keys = SyncTable(unquotedTableName, "")
-        database.rawQuery(
+        database.prepare(
             // may not work on old Android
             //"SELECT * FROM pragma_table_info('${unquotedTableName}') where pk = 1;",
-            "pragma table_info('${unquotedTableName}');",
-            null
+            "pragma table_info('${unquotedTableName}');"
         ).use { cursor ->
-            keys.load(cursor) { c -> c.getInt(c.getColumnIndex("pk")) == 1 }
+            val columns = cursor.getColumnNames()
+            keys.load(cursor) { c -> c.getInt(columns.indexOf("pk")) == 1 }
         }
 
         val lstKeys = ArrayList<SyncColumn>()
@@ -97,7 +96,7 @@ class SqliteTableBuilder(
         val relationsTable =
         // may not work on old Android
 //            database.rawQuery("SELECT * FROM pragma_foreign_key_list('$unquotedTableName')", null)
-            database.rawQuery("pragma foreign_key_list('$unquotedTableName')", null)
+            database.prepare("pragma foreign_key_list('$unquotedTableName')")
                 .use { cursor ->
                     SyncTable(unquotedTableName).apply {
                         load(cursor)
@@ -245,11 +244,11 @@ class SqliteTableBuilder(
 
     override fun existsTrackingTable(): Boolean {
         val tbl = this.trackingTableName.unquoted().toString()
-        database.rawQuery(
-            "select count(*) from sqlite_master where name = ? AND type='table'",
-            arrayOf(tbl)
+        database.prepare(
+            "select count(*) from sqlite_master where name = ? AND type='table'"
         ).use { cursor ->
-            return cursor.moveToNext() && cursor.getInt(0) > 0
+            cursor.bindText(1, tbl)
+            return cursor.step() && cursor.getInt(0) > 0
         }
     }
 
@@ -331,11 +330,11 @@ class SqliteTableBuilder(
         val commandTriggerName = this.getTriggerCommandName(triggerType)
         val triggerName = ParserName.parse(commandTriggerName).toString()
 
-        database.rawQuery(
-            "select count(*) from sqlite_master where name = ? AND type='trigger'",
-            arrayOf(triggerName)
+        database.prepare(
+            "select count(*) from sqlite_master where name = ? AND type='trigger'"
         ).use { cursor ->
-            return cursor.moveToNext() && cursor.getInt(0) > 0
+            cursor.bindText(1, triggerName)
+            return cursor.step() && cursor.getInt(0) > 0
         }
     }
 
@@ -354,15 +353,15 @@ class SqliteTableBuilder(
         }
 
     override fun existsTriggerCommand(triggerType: DbTriggerType): Boolean {
-        val commandTriggerName =
-            String.format(getTriggerCommandName(triggerType), tableName.unquoted().toString())
+        val commandTriggerName = getTriggerCommandName(triggerType)
+//            currentPlatform.formatString(getTriggerCommandName(triggerType), tableName.unquoted().toString())
         val triggerName = ParserName.parse(commandTriggerName).toString()
 
-        return database.rawQuery(
-            "select count(*) from sqlite_master where name = @triggerName AND type='trigger'",
-            arrayOf(triggerName)
+        return database.prepare(
+            "select count(*) from sqlite_master where name = @triggerName AND type='trigger'"
         ).use { cursor ->
-            cursor.moveToNext() && cursor.getInt(0) > 0
+            cursor.bindText(1, triggerName)
+            cursor.step() && cursor.getInt(0) > 0
         }
     }
 
@@ -377,22 +376,14 @@ class SqliteTableBuilder(
     private lateinit var triggersNames: Map<DbTriggerType, String>
 
     private fun initTriggerNames() {
-        val tpref = if (this.setup.triggersPrefix.isNotBlank()) this.setup.triggersPrefix else ""
-        val tsuf = if (this.setup.triggersSuffix.isNotBlank()) this.setup.triggersSuffix else ""
+        val tpref = this.setup.triggersPrefix
+        val tsuf = this.setup.triggersSuffix
+        val tblName = tableName.unquoted().normalized()
 
         triggersNames = hashMapOf(
-            DbTriggerType.Insert to String.format(
-                "[%s_insert_trigger]",
-                "${tpref}${tableName.unquoted().normalized()}${tsuf}"
-            ),
-            DbTriggerType.Update to String.format(
-                "[%s_update_trigger]",
-                "${tpref}${tableName.unquoted().normalized()}${tsuf}"
-            ),
-            DbTriggerType.Delete to String.format(
-                "[%s_delete_trigger]",
-                "${tpref}${tableName.unquoted().normalized()}${tsuf}"
-            )
+            DbTriggerType.Insert to "[$tpref$tblName${tsuf}_insert_trigger]",
+            DbTriggerType.Update to "[$tpref$tblName${tsuf}_update_trigger]",
+            DbTriggerType.Delete to "[$tpref$tblName${tsuf}_delete_trigger]",
         )
     }
 
@@ -420,7 +411,7 @@ class SqliteTableBuilder(
 //        val commandColumn = "SELECT * FROM pragma_table_info('$unquotedTableName');"
         val commandColumn = "pragma table_info('$unquotedTableName');"
         val syncTable = SyncTable(unquotedTableName, "")
-        database.rawQuery(commandColumn, null).use { cursor -> syncTable.load(cursor) }
+        database.prepare(commandColumn).use { cursor -> syncTable.load(cursor) }
         return syncTable
     }
 
@@ -435,7 +426,7 @@ class SqliteTableBuilder(
     ): String {
         // We MUST check if we are from the same provider (if it's mysql or oracle, we fallback on dbtype
         if (originalDbType.isNotBlank() && fromProviderType == ownerProviderType) {
-           val ownedDbType = validateOwnerDbType(originalDbType, isUnsigned, isUnicode, maxLength)
+            val ownedDbType = validateOwnerDbType(originalDbType, isUnsigned, isUnicode, maxLength)
             return when (ownedDbType) {
                 SqliteType.Integer -> "integer"
                 SqliteType.Real -> "numeric"
@@ -443,7 +434,7 @@ class SqliteTableBuilder(
                 SqliteType.Blob -> "blob"
                 else -> throw Exception("this SqliteType ${ownedDbType} is not supported")
             }
-            return getStringFromOwnerDbType(ownedDbType)//DbType.values()[ownedDbType.ordinal])
+            return getStringFromOwnerDbType(ownedDbType)//DbType.entries[ownedDbType.ordinal])
         }
 
         // if it's not the same provider, fallback on DbType instead.
@@ -481,10 +472,12 @@ class SqliteTableBuilder(
             DbType.Time,
             DbType.DateTimeOffset ->
                 "text"
+
             DbType.Guid,
             DbType.Binary,
             DbType.Object ->
                 "blob"
+
             DbType.Boolean,
             DbType.Byte,
             DbType.Int16,
@@ -495,16 +488,19 @@ class SqliteTableBuilder(
             DbType.UInt64,
             DbType.SByte ->
                 "integer"
+
             DbType.Date,
             DbType.DateTime,
             DbType.DateTime2 ->
                 "datetime"
+
             DbType.Decimal,
             DbType.Double,
             DbType.Single,
             DbType.Currency,
             DbType.VarNumeric ->
                 "real"
+
             else ->
                 throw Exception("this DbType ${dbType} is not supported")
         }
@@ -527,22 +523,29 @@ class SqliteTableBuilder(
         when (typeName.lowercase()) {
             "bit" ->
                 return DbType.Boolean
+
             "integer",
             "bigint" ->
                 return DbType.Int64
+
             "numeric",
             "real",
             "float" ->
                 return DbType.Double
+
             "decimal" ->
                 return DbType.Decimal
+
             "blob",
             "image" ->
                 return DbType.Binary
+
             "datetime" ->
                 return DbType.DateTime
+
             "time" ->
                 return DbType.Time
+
             "text",
             "varchar" ->
                 return DbType.String
@@ -561,18 +564,21 @@ class SqliteTableBuilder(
         if (tn.contains("("))
             tn = tn.substring(0, tn.indexOf("("));
 
-        when (tn.lowercase(Locale.getDefault())) {
+        when (tn.lowercase()) {
             "bit",
             "integer",
             "bigint" ->
                 return SqliteType.Integer
+
             "numeric",
             "decimal",
             "real" ->
                 return SqliteType.Real
+
             "blob",
             "image" ->
                 return SqliteType.Blob
+
             "datetime",
             "text" ->
                 return SqliteType.Text
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteType.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteType.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteType.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/sqlite/SqliteType.kt
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt
new file mode 100644
index 0000000..7008bfd
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt
@@ -0,0 +1,171 @@
+package com.mimetis.dotmim.sync.web.client
+
+import com.mimetis.dotmim.sync.serialization.Converter
+import io.ktor.client.HttpClient
+import io.ktor.client.call.body
+import io.ktor.client.plugins.HttpSend
+import io.ktor.client.plugins.plugin
+import io.ktor.client.plugins.timeout
+import io.ktor.client.request.post
+import io.ktor.client.request.setBody
+import io.ktor.client.statement.readRawBytes
+import io.ktor.http.ContentType
+import io.ktor.http.HttpHeaders
+import io.ktor.http.content.OutgoingContent
+import io.ktor.http.contentType
+import io.ktor.util.encodeBase64
+import org.kotlincrypto.hash.sha2.SHA256
+import kotlin.uuid.ExperimentalUuidApi
+
+@OptIn(ExperimentalUuidApi::class)
+internal class DotmimServiceImpl(
+    serviceAddress: String,
+    val client: HttpClient
+) {
+    private val url = serviceAddress.trimEnd('/') + "/sync"
+
+    suspend fun ensureScope(
+        authHeader: String,
+        args: HttpMessageEnsureScopesRequest,
+        converter: Converter?
+    ): HttpMessageEnsureScopesResponse =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.EnsureScopes.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+        }.body()
+
+    suspend fun ensureSchema(
+        authHeader: String,
+        args: HttpMessageEnsureScopesRequest,
+        converter: Converter?
+    ): HttpMessageEnsureSchemaResponse =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.EnsureSchema.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+        }.body()
+
+    suspend fun getSnapshot(
+        authHeader: String,
+        args: HttpMessageSendChangesRequest,
+        converter: Converter?
+    ): HttpMessageSummaryResponse =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.GetSnapshot.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+        }.body()
+
+    suspend fun sendChanges(
+        authHeader: String,
+        args: HttpMessageSendChangesRequest,
+        converter: Converter?
+    ): HttpMessageSummaryResponse =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.SendChangesInProgress.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+            timeout {
+                socketTimeoutMillis = 10 * 60 * 1000
+            }
+        }.body()
+
+    suspend fun moreChanges(
+        authHeader: String,
+        args: HttpMessageGetMoreChangesRequest,
+        converter: Converter?
+    ): ByteArray =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.GetSummary.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+            timeout {
+                socketTimeoutMillis = 10 * 60 * 1000
+            }
+        }.readRawBytes()
+
+    suspend fun endDownloadChanges(
+        authHeader: String,
+        args: HttpMessageGetMoreChangesRequest,
+        converter: Converter?
+    ): HttpMessageGetMoreChangesRequest =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.SendEndDownloadChanges.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+            timeout {
+                socketTimeoutMillis = 10 * 60 * 1000
+            }
+        }.body()
+
+    suspend fun getSummary(
+        authHeader: String,
+        args: HttpMessageSendChangesRequest,
+        converter: Converter?
+    ): HttpMessageSummaryResponse =
+        client.post(url) {
+            headers.append(HttpHeaders.Authorization, authHeader)
+            headers.append("dotmim-sync-session-id", args.syncContext.sessionId.toString())
+            headers.append("dotmim-sync-scope-name", args.syncContext.scopeName)
+            headers.append("dotmim-sync-step", HttpStep.GetSummary.value.toString())
+            if (converter != null)
+                headers.append("dotmim-sync-converter", converter.key)
+
+            contentType(ContentType.Application.Json)
+            setBody(args)
+            timeout {
+                socketTimeoutMillis = 10 * 60 * 1000
+            }
+        }.body()
+
+    init {
+        val md = SHA256()
+        client.plugin(HttpSend).intercept { request ->
+            request.headers["dotmim-sync-serialization-format"] = """{"f":"json", "s":0}"""
+            if (request.body is OutgoingContent.ByteArrayContent) {
+                val bytes = (request.body as OutgoingContent.ByteArrayContent).bytes()
+                val digest = md.digest(bytes)
+                val hash = digest.encodeBase64()
+                request.headers["dotmim-sync-hash"] =  hash
+            }
+            execute(request)
+        }
+    }
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/FancyCoreProvider.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/FancyCoreProvider.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/FancyCoreProvider.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/FancyCoreProvider.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureSchemaResponse.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureSchemaResponse.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureSchemaResponse.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureSchemaResponse.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesRequest.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesRequest.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesRequest.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesRequest.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesResponse.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesResponse.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesResponse.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageEnsureScopesResponse.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageGetMoreChangesRequest.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageGetMoreChangesRequest.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageGetMoreChangesRequest.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageGetMoreChangesRequest.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesRequest.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesRequest.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesRequest.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesRequest.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesResponse.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesResponse.kt
similarity index 100%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesResponse.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSendChangesResponse.kt
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt
similarity index 97%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt
index 65205a4..9bd1dcf 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpMessageSummaryResponse.kt
@@ -45,5 +45,5 @@ class HttpMessageSummaryResponse(
         var clientChangesApplied: DatabaseChangesApplied,
 
         @SerialName("crp")
-        var conflictResolutionPolicy: ConflictResolutionPolicy = ConflictResolutionPolicy.values()[0]
+        var conflictResolutionPolicy: ConflictResolutionPolicy = ConflictResolutionPolicy.entries[0]
 )
diff --git a/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpStep.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpStep.kt
new file mode 100644
index 0000000..a8efd61
--- /dev/null
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/HttpStep.kt
@@ -0,0 +1,39 @@
+package com.mimetis.dotmim.sync.web.client
+
+import com.mimetis.dotmim.sync.data.EnumWithValue
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+class HttpStepSerializer : KSerializer<HttpStep> {
+    private var values: Map<Int, HttpStep>? = null
+
+    override val descriptor = PrimitiveSerialDescriptor("com.mimetis.dotmim.sync.EnumByValue.HttpStep", PrimitiveKind.INT)
+
+    override fun serialize(encoder: Encoder, value: HttpStep) {
+        encoder.encodeInt(value.value)
+    }
+
+    override fun deserialize(decoder: Decoder): HttpStep =
+        (values
+            ?: HttpStep.entries.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
+}
+
+@Serializable(with = HttpStepSerializer::class)
+enum class HttpStep(override val value: Int) : EnumWithValue {
+    None(0),
+    EnsureSchema(1),
+    EnsureScopes(2),
+    SendChanges(3),
+    SendChangesInProgress(4),
+    GetChanges(5),
+    GetEstimatedChangesCount(6),
+    GetMoreChanges(7),
+    GetChangesInProgress(8),
+    GetSnapshot(9),
+    GetSummary(10),
+    SendEndDownloadChanges(1)
+}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt
similarity index 86%
rename from dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt
rename to dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt
index 5b16b8d..dc5a276 100644
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt
+++ b/dotmimsync-core/src/commonMain/kotlin/com/mimetis/dotmim/sync/web/client/WebClientOrchestrator.kt
@@ -1,8 +1,19 @@
 package com.mimetis.dotmim.sync.web.client
 
-import android.util.Log
-import com.mimetis.dotmim.sync.*
-import com.mimetis.dotmim.sync.args.*
+import com.mimetis.dotmim.sync.DbSyncAdapter
+import com.mimetis.dotmim.sync.Progress
+import com.mimetis.dotmim.sync.SyncContext
+import com.mimetis.dotmim.sync.SyncOptions
+import com.mimetis.dotmim.sync.Tuple
+import com.mimetis.dotmim.sync.args.HttpBatchesDownloadedArgs
+import com.mimetis.dotmim.sync.args.HttpBatchesDownloadingArgs
+import com.mimetis.dotmim.sync.args.HttpGettingSchemaRequestArgs
+import com.mimetis.dotmim.sync.args.HttpGettingSchemaResponseArgs
+import com.mimetis.dotmim.sync.args.HttpGettingScopeRequestArgs
+import com.mimetis.dotmim.sync.args.HttpGettingServerChangesRequestArgs
+import com.mimetis.dotmim.sync.args.HttpGettingServerChangesResponseArgs
+import com.mimetis.dotmim.sync.args.HttpSendingClientChangesRequestArgs
+import com.mimetis.dotmim.sync.args.ProgressArgs
 import com.mimetis.dotmim.sync.batch.BatchInfo
 import com.mimetis.dotmim.sync.batch.BatchPartInfo
 import com.mimetis.dotmim.sync.enumerations.ConflictResolutionPolicy
@@ -17,19 +28,31 @@ import com.mimetis.dotmim.sync.serialization.Converter
 import com.mimetis.dotmim.sync.set.ContainerSet
 import com.mimetis.dotmim.sync.set.SyncSet
 import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.io.File
-import java.net.URL
-import java.text.SimpleDateFormat
-import java.util.*
-
+import com.mimetis.dotmim.sync.utcNow
+import io.ktor.client.HttpClient
+import io.ktor.http.Url
+import kotlinx.datetime.LocalDateTime
+import kotlinx.datetime.TimeZone
+import kotlinx.datetime.format.char
+import kotlinx.datetime.toLocalDateTime
+import kotlinx.io.buffered
+import kotlinx.io.files.Path
+import kotlinx.io.files.SystemFileSystem
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.uuid.ExperimentalUuidApi
+import kotlin.uuid.Uuid
+
+@OptIn(ExperimentalUuidApi::class, ExperimentalTime::class)
 class WebClientOrchestrator(
-    serviceAddress: String,
+    private val serviceAddress: String,
+    client: HttpClient,
     private val authHeader: String,
     private val converter: Converter? = null,
     private val maxDownladingDegreeOfParallelism: Int = 4
 ) : RemoteOrchestrator(FancyCoreProvider(), SyncOptions(), SyncSetup()) {
-    private val TAG = this::class.java.simpleName
-    private val service = DotmimServiceImpl(serviceAddress)
+    //    private val TAG = this::class.java.simpleName
+    private val service = DotmimServiceImpl(serviceAddress, client)
 
     /**
      * Send a request to remote web proxy for First step : Ensure scopes and schema
@@ -127,10 +150,20 @@ class WebClientOrchestrator(
 
         // Generate a batch directory
         val batchDirectoryRoot = this.options.batchDirectory
-        val batchDirectoryName = SimpleDateFormat("yyyy_MM_dd_ss", Locale.getDefault()).format(
-            Calendar.getInstance(Locale.getDefault()).time
-        ) + UUID.randomUUID().toString().replace(".", "")
-        val batchDirectoryFullPath = File(batchDirectoryRoot, batchDirectoryName).absolutePath
+        val batchDirectoryName =
+            LocalDateTime.Format {
+                year()
+                char('_')
+                monthNumber()
+                char('_')
+                day()
+                char('_')
+                second()
+                char('_')
+            }.format(Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())) +
+                    Uuid.random().toString().replace(".", "")
+
+        val batchDirectoryFullPath = Path(batchDirectoryRoot, batchDirectoryName)
 
         // Create the BatchInfo serialized (forced because in a snapshot call, so we are obviously serialized on disk)
         val serverBatchInfo = BatchInfo(false, schema!!, batchDirectoryRoot, batchDirectoryName)
@@ -159,14 +192,19 @@ class WebClientOrchestrator(
 
         serverBatchInfo.batchPartsInfo?.forEach { bpi ->
             // Create the message enveloppe
-            Log.d(TAG, "CLIENT bpi.FileName:${bpi.fileName}. bpi.Index:${bpi.index}")
+//            Log.d(TAG, "CLIENT bpi.FileName:${bpi.fileName}. bpi.Index:${bpi.index}")
 
             val changesToSend3 = HttpMessageGetMoreChangesRequest(ctx, bpi.index)
 //            var serializer3 = this.options.SerializerFactory.GetSerializer<HttpMessageGetMoreChangesRequest>()
 //            val binaryData3 = await serializer3.SerializeAsync(changesToSend3)
 //            val step3 = HttpStep.GetMoreChanges
 
-            val args2 = HttpGettingServerChangesRequestArgs(bpi.index, serverBatchInfo.batchPartsInfo!!.size, summaryResponseContent.syncContext, this.getServiceHost())
+            val args2 = HttpGettingServerChangesRequestArgs(
+                bpi.index,
+                serverBatchInfo.batchPartsInfo!!.size,
+                summaryResponseContent.syncContext,
+                this.getServiceHost()
+            )
             this.intercept(args2)
 
             val response = service.moreChanges(authHeader, changesToSend3, converter)
@@ -174,7 +212,7 @@ class WebClientOrchestrator(
             // Serialize
             serialize(response, bpi.fileName, batchDirectoryFullPath, this)
 
-            bpi.serializedType = BatchPartInfo::class.java
+            bpi.serializedType = BatchPartInfo::class
 
             // Raise response from server containing a batch changes
             val args3 = HttpGettingServerChangesResponseArgs(
@@ -404,9 +442,18 @@ class WebClientOrchestrator(
 
         // Generate the batch directory
         val batchDirectoryRoot = this.options.batchDirectory
-        val batchDirectoryName = SimpleDateFormat("yyyy_MM_dd_ss", Locale.getDefault()).format(
-            Calendar.getInstance(Locale.getDefault()).time
-        ) + UUID.randomUUID().toString().replace(".", "")
+        val batchDirectoryName =
+            LocalDateTime.Format {
+                year()
+                char('_')
+                monthNumber()
+                char('_')
+                day()
+                char('_')
+                second()
+                char('_')
+            }.format(Clock.System.now().toLocalDateTime(TimeZone.currentSystemDefault())) +
+                    Uuid.random().toString().replace(".", "")
 
         serverBatchInfo.directoryRoot = batchDirectoryRoot
         serverBatchInfo.directoryName = batchDirectoryName
@@ -443,9 +490,9 @@ class WebClientOrchestrator(
             val response = service.moreChanges(authHeader, changesToSend3, converter)
 
             // Serialize
-            serialize(response, bpi.fileName, serverBatchInfo.getDirectoryFullPath(), this)
+            serialize(response, bpi.fileName, Path(serverBatchInfo.getDirectoryFullPath()), this)
 
-            bpi.serializedType = BatchPartInfo::class.java
+            bpi.serializedType = BatchPartInfo::class
 
             // Raise response from server containing a batch changes
             val args3 = HttpGettingServerChangesResponseArgs(
@@ -509,7 +556,7 @@ class WebClientOrchestrator(
             .forEach { table -> table.rows.forEach { row -> this.converter?.afterDeserialized(row) } }
 
     private fun getServiceHost() =
-        URL(service.serviceAddress).host
+        Url(serviceAddress).host
 
     private fun beforeSerializeRows(data: SyncSet) {
         data.tables
@@ -522,14 +569,12 @@ class WebClientOrchestrator(
     private fun serialize(
         data: ByteArray,
         fileName: String,
-        directoryFullPath: String,
+        directoryFullPath: Path,
         orchestrator: BaseOrchestrator
     ) {
-        val dir = File(directoryFullPath)
-        if (dir.isDirectory && !dir.exists())
-            dir.mkdir()
-
-        val file = File(directoryFullPath, fileName)
-        file.writeBytes(data)
+        SystemFileSystem.createDirectories(directoryFullPath)
+        SystemFileSystem.sink(Path(directoryFullPath, fileName)).use {
+            it.buffered().write(data)
+        }
     }
 }
diff --git a/dotmimsync-core/src/iosMain/kotlin/com/mimetis/dotmimsync/Platform.ios.kt b/dotmimsync-core/src/iosMain/kotlin/com/mimetis/dotmimsync/Platform.ios.kt
new file mode 100644
index 0000000..2e6346b
--- /dev/null
+++ b/dotmimsync-core/src/iosMain/kotlin/com/mimetis/dotmimsync/Platform.ios.kt
@@ -0,0 +1,10 @@
+package com.mimetis.dotmimsync
+
+import platform.UIKit.UIDevice
+
+class IOSPlatform : Platform {
+    override val name: String =
+        UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
+}
+
+actual fun getPlatform(): Platform = IOSPlatform()
diff --git a/dotmimsync-core/src/jvmMain/kotlin/com/mimetis/dotmim/sync/Platform.jvm.kt b/dotmimsync-core/src/jvmMain/kotlin/com/mimetis/dotmim/sync/Platform.jvm.kt
new file mode 100644
index 0000000..7b209ec
--- /dev/null
+++ b/dotmimsync-core/src/jvmMain/kotlin/com/mimetis/dotmim/sync/Platform.jvm.kt
@@ -0,0 +1,7 @@
+package com.mimetis.dotmimsync
+
+class JvmPlatform : Platform {
+    override val name: String = "Java ${System.getProperty("java.version")}"
+}
+
+actual fun getPlatform(): Platform = JvmPlatform()
\ No newline at end of file
diff --git a/dotmimsync/.gitignore b/dotmimsync/.gitignore
deleted file mode 100644
index 42afabf..0000000
--- a/dotmimsync/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/dotmimsync/build.gradle b/dotmimsync/build.gradle
deleted file mode 100644
index ee5b18c..0000000
--- a/dotmimsync/build.gradle
+++ /dev/null
@@ -1,74 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'kotlin-android'
-    id 'kotlinx-serialization'
-    id 'maven-publish'
-}
-
-group = 'com.github.vunder'
-
-android {
-    compileSdk rootProject.ext.compileSdk
-    buildToolsVersion rootProject.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdk rootProject.ext.minSdk
-        targetSdk rootProject.ext.targetSdk
-        versionCode 6
-        versionName rootProject.ext.libraryVersion
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
-        useIR = true
-    }
-}
-
-dependencies {
-    implementation 'androidx.core:core-ktx:1.7.0'
-    // Serialization
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.3.1'
-    // Retrofit
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:0.8.0'
-    implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.2'
-    implementation 'com.squareup.okhttp3:okhttp-urlconnection:5.0.0-alpha.2'
-    implementation 'ru.gildor.coroutines:kotlin-coroutines-okhttp:1.0'
-
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.9'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
-
-publishing {
-    publications {
-        library(MavenPublication) {
-            groupId "com.github.vunder"//packageName
-            artifactId "dotmimsync"//project.getName()
-            version = rootProject.ext.libraryVersion
-            artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
-
-            println "publishing: " + groupId
-            println "publishing: " + artifactId
-            println "publishing: " + version
-        }
-    }
-}
diff --git a/dotmimsync/consumer-rules.pro b/dotmimsync/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
diff --git a/dotmimsync/proguard-rules.pro b/dotmimsync/proguard-rules.pro
deleted file mode 100644
index 481bb43..0000000
--- a/dotmimsync/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/dotmimsync/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt b/dotmimsync/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt
deleted file mode 100644
index 1754307..0000000
--- a/dotmimsync/src/androidTest/java/com/mimetis/dotmimsync/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.mimetis.dotmimsync
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.mimetis.dotmimsync.test", appContext.packageName)
-    }
-}
\ No newline at end of file
diff --git a/dotmimsync/src/main/AndroidManifest.xml b/dotmimsync/src/main/AndroidManifest.xml
deleted file mode 100644
index 48239b4..0000000
--- a/dotmimsync/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mimetis.dotmimsync">
-
-</manifest>
\ No newline at end of file
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt
deleted file mode 100644
index ab3fe9d..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/ArrayListLikeSerializer.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mimetis.dotmim.sync
-
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.SerialDescriptor
-import kotlinx.serialization.descriptors.listSerialDescriptor
-import kotlinx.serialization.encoding.CompositeDecoder
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import kotlinx.serialization.serializer
-import com.mimetis.dotmim.sync.parameter.SyncParameter
-import java.lang.reflect.ParameterizedType
-
-open class ArrayListLikeSerializer<T, R>(private val elementSerializer: KSerializer<R>) : KSerializer<T>
-        where T : ArrayList<R> {
-    override val descriptor: SerialDescriptor = listSerialDescriptor<SyncParameter>()
-
-    override fun serialize(encoder: Encoder, value: T) {
-        val size = value.size
-        val composite = encoder.beginCollection(descriptor, size)
-        for (index in 0 until size)
-            composite.encodeSerializableElement(elementSerializer.descriptor, index, elementSerializer, value[index])
-        composite.endStructure(descriptor)
-    }
-
-    inline fun<reified X > foo(): KSerializer<R> {
-        return serializer(X::class.java) as KSerializer<R>
-    }
-
-    override fun deserialize(decoder: Decoder): T {
-        val parameters = ((this.javaClass
-                .genericSuperclass as ParameterizedType)
-                .actualTypeArguments[0] as Class<T>).constructors.elementAt(0).newInstance() as T
-
-        val compositeDecoder = decoder.beginStructure(descriptor)
-
-        if (compositeDecoder.decodeSequentially()) {
-            val size = compositeDecoder.decodeCollectionSize(descriptor)
-            for (i in 0 until size) {
-                val element = compositeDecoder.decodeSerializableElement(elementSerializer.descriptor, i, elementSerializer)
-                parameters.add(element)
-            }
-        } else {
-            while (true) {
-                val index = compositeDecoder.decodeElementIndex(elementSerializer.descriptor)
-                if (index == CompositeDecoder.DECODE_DONE) break
-                val element = compositeDecoder.decodeSerializableElement(elementSerializer.descriptor, index, elementSerializer)
-                parameters.add(element)
-            }
-        }
-        compositeDecoder.endStructure(descriptor)
-
-        return parameters
-    }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DataRowState.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DataRowState.kt
deleted file mode 100644
index b11910b..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DataRowState.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.mimetis.dotmim.sync
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
-import com.mimetis.dotmim.sync.data.EnumWithValue
-
-class DataRowStateSerializer : EnumByValueSerializer<DataRowState>()
-
-@Serializable(with = DataRowStateSerializer::class)
-enum class DataRowState(override val value: Int) : EnumWithValue {
-    Detached(1),
-    Unchanged(2),
-    Added(4),
-    Deleted(8),
-    Modified(16)
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DateSerializer.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DateSerializer.kt
deleted file mode 100644
index 34a16c2..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/DateSerializer.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mimetis.dotmim.sync
-
-import android.annotation.SuppressLint
-import android.os.Build
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import java.text.SimpleDateFormat
-import java.util.*
-
-object DateSerializer : KSerializer<Date> {
-    private val dateFormat =
-        // SDK 24
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSX"
-        else
-            "yyyy-MM-dd'T'HH:mm:ss.SSSSSSSZZZZZ"
-
-    private val gmtTimeZone = TimeZone.getTimeZone("GMT")
-
-    @SuppressLint("SimpleDateFormat")
-    private val simpleDateFormat = SimpleDateFormat(dateFormat).apply { timeZone = gmtTimeZone }
-
-    override val descriptor = PrimitiveSerialDescriptor("Date", PrimitiveKind.STRING)
-
-    override fun deserialize(decoder: Decoder): Date =
-        simpleDateFormat.parse(decoder.decodeString())!!
-
-    override fun serialize(encoder: Encoder, value: Date) =
-        encoder.encodeString(simpleDateFormat.format(value))
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/Extensions.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/Extensions.kt
deleted file mode 100644
index 8a02a75..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/Extensions.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.mimetis.dotmim.sync
-
-import com.mimetis.dotmim.sync.set.SyncColumn
-import com.mimetis.dotmim.sync.set.SyncColumns
-import com.mimetis.dotmim.sync.set.SyncNamedItem
-import java.text.SimpleDateFormat
-import java.util.*
-
-fun SyncColumns?.compareWith(other: SyncColumns?): Boolean {
-    // checking null ref
-    if ((this == null && other != null) || (this != null && other == null))
-        return false
-
-    // If both are null, return true
-    if (this == null && other == null)
-        return true
-
-    if (this!!.size != other!!.size)
-        return false
-
-    // Check all items are identical
-    return this.all { sourceItem ->
-        other.any { otherItem ->
-            val cSourceItem = sourceItem as? SyncNamedItem<SyncColumn>
-            val cOtherItem = otherItem as? SyncNamedItem<SyncColumn>
-
-            if (cSourceItem != null && cOtherItem != null)
-                return cSourceItem.equalsByProperties(otherItem)
-            else
-                return sourceItem.equals(otherItem)
-
-        }
-    }
-}
-
-fun utcNow(): Long {
-    val time = Calendar.getInstance(Locale.getDefault()).timeInMillis
-    try {
-        val dateFormat = SimpleDateFormat("yyyy.MM.dd HH:mm:ss", Locale.getDefault())
-        val date = Date(time)
-        dateFormat.timeZone = TimeZone.getTimeZone("UTC")
-        val strDate = dateFormat.format(date)
-//            System.out.println("Local Millis * " + date.getTime() + "  ---UTC time  " + strDate);//correct
-
-        val dateFormatLocal = SimpleDateFormat("yyyy.MM.dd HH:mm:ss", Locale.getDefault())
-        val utcDate = dateFormatLocal.parse(strDate)
-//            System.out.println("UTC Millis * " + utcDate.getTime() + " ------  " + dateFormatLocal.format(utcDate));
-        val utcMillis = utcDate?.time ?: Date().time
-        return utcMillis
-    } catch (e: Exception) {
-        e.printStackTrace()
-    }
-    return time
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByNameSerializer.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByNameSerializer.kt
deleted file mode 100644
index 945a53b..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByNameSerializer.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mimetis.dotmim.sync.data
-
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import java.lang.reflect.ParameterizedType
-
-open class EnumByNameSerializer<T> : KSerializer<T>
-        where T : Enum<T> {
-    private var values: Map<String, T>? = null
-
-    @Suppress("UNCHECKED_CAST")
-    private fun getEnumClass(): Class<T> =
-        ((this.javaClass
-            .genericSuperclass as ParameterizedType)
-            .actualTypeArguments[0] as Class<T>)
-
-    override val descriptor = PrimitiveSerialDescriptor("EnumByName_${getEnumClass().name}", PrimitiveKind.STRING)
-
-    override fun deserialize(decoder: Decoder): T =
-        (values
-            ?: getEnumClass().enumConstants.associateBy { it.name }.also { values = it })[decoder.decodeString()]!!
-
-//    private inline fun <reified R : T> getValue(name: String): T =
-//            (values
-//                    ?: R::class.java.enumConstants.associateBy { it.name }.also { values = it })[name]!!
-
-    override fun serialize(encoder: Encoder, value: T) {
-        encoder.encodeString(value.name)
-    }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByValueSerializer.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByValueSerializer.kt
deleted file mode 100644
index eb14013..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/data/EnumByValueSerializer.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mimetis.dotmim.sync.data
-
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-import java.lang.reflect.ParameterizedType
-
-open class EnumByValueSerializer<T> : KSerializer<T>
-        where T : Enum<T>, T : EnumWithValue {
-    private var values: Map<Int, T>? = null
-
-    @Suppress("UNCHECKED_CAST")
-    private fun getEnumClass(): Class<T> =
-        ((this.javaClass
-            .genericSuperclass as ParameterizedType)
-            .actualTypeArguments[0] as Class<T>)
-
-    override val descriptor = PrimitiveSerialDescriptor("EnumByValue_${getEnumClass().name}", PrimitiveKind.INT)
-
-    override fun deserialize(decoder: Decoder): T =
-        (values
-            ?: getEnumClass().enumConstants.associateBy { it.value }.also { values = it })[decoder.decodeInt()]!!
-
-//    private inline fun <reified R : T> getValue(name: String): T =
-//            (values
-//                    ?: R::class.java.enumConstants.associateBy { it.name }.also { values = it })[name]!!
-
-    override fun serialize(encoder: Encoder, value: T) {
-        encoder.encodeInt(value.value)
-    }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncStage.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncStage.kt
deleted file mode 100644
index 9c12440..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncStage.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mimetis.dotmim.sync.enumerations
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
-import com.mimetis.dotmim.sync.data.EnumWithValue
-
-@Serializable(with = SyncStageSerializer::class)
-enum class SyncStage(override val value: Int) : EnumWithValue {
-    None(0),
-
-    BeginSession(1),
-    EndSession(2),
-
-    ScopeLoading(3),
-    ScopeWriting(4),
-
-    SnapshotCreating(5),
-    SnapshotApplying(6),
-
-    SchemaReading(7),
-
-    Provisioning(8),
-    Deprovisioning(9),
-
-    ChangesSelecting(10),
-    ChangesApplying(11),
-
-    Migrating(12),
-
-    MetadataCleaning(13),
-}
-
-class SyncStageSerializer : EnumByValueSerializer<SyncStage>()
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncWay.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncWay.kt
deleted file mode 100644
index 7d4ad29..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/enumerations/SyncWay.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mimetis.dotmim.sync.enumerations
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
-import com.mimetis.dotmim.sync.data.EnumWithValue
-
-class SyncWaySerializer : EnumByValueSerializer<SyncWay>()
-
-@Serializable(with = SyncWaySerializer::class)
-enum class SyncWay(override val value: Int) : EnumWithValue {
-    /// <summary>
-    /// No sync engaged
-    /// </summary>
-    None(0),
-
-    /// <summary>
-    /// Sync is selecting then downloading changes from server
-    /// </summary>
-    Download(1),
-
-    /// <summary>
-    /// Sync is selecting then uploading changes from client
-    /// </summary>
-    Upload(2)
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameters.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameters.kt
deleted file mode 100644
index 3629d92..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/parameter/SyncParameters.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mimetis.dotmim.sync.parameter
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncParametersSerializer::class)
-class SyncParameters : ArrayList<SyncParameter>()
-
-object SyncParametersSerializer : ArrayListLikeSerializer<SyncParameters, SyncParameter>(SyncParameter.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/serialization/DmUtils.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/serialization/DmUtils.kt
deleted file mode 100644
index 9e4f00d..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/serialization/DmUtils.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.mimetis.dotmim.sync.serialization
-
-import java.math.BigDecimal
-import java.util.*
-
-object DmUtils {
-    fun getAssemblyQualifiedName(valueType: Class<*>): String =
-            when (valueType) {
-                Boolean::class.java ->
-                    "1"
-                Byte::class.java ->
-                    "2"
-                Char::class.java ->
-                    "3"
-                Double::class.java ->
-                    "4"
-                Float::class.java ->
-                    "5"
-                Int::class.java ->
-                    "6"
-                Long::class.java ->
-                    "7"
-                Short::class.java ->
-                    "8"
-                UInt::class.java ->
-                    "9"
-                ULong::class.java ->
-                    "10"
-                UShort::class.java ->
-                    "11"
-                ByteArray::class.java ->
-                    "12"
-                Date::class.java ->
-                    "13"
-//                 DateTimeOffset::class.java ->
-//                    "14"
-                BigDecimal::class.java ->
-                    "15"
-                UUID::class.java ->
-                    "16"
-                String::class.java ->
-                    "17"
-//                    SByte::class.java ->
-//                        "18"
-//                    TimeSpan::class.java ->
-//                        "19"
-                CharArray::class.java ->
-                    "20"
-                else ->
-                    valueType.name
-            }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumns.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumns.kt
deleted file mode 100644
index e757343..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncColumns.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncColumnsSerializer::class)
-class SyncColumns() : ArrayList<SyncColumn>() {
-    private val columnsDictionary = HashMap<String, SyncColumn?>()
-    private val columnsIndexDictionary = HashMap<String, Int>()
-
-    /**
-     * Column's schema
-     */
-    @Transient
-    var table: SyncTable? = null
-
-    constructor(table: SyncTable) : this() {
-        this.table = table
-    }
-
-    fun ensureColumns(table: SyncTable) {
-        this.table = table
-    }
-
-    fun getIndex(columnName: String): Int =
-        columnsIndexDictionary.getOrPut(columnName) {
-            this.indexOfFirst { c ->
-                c.columnName.equals(
-                    columnName,
-                    true
-                )
-            }
-        }
-
-    /**
-     * Get a Column by its name
-     */
-    operator fun get(columnName: String): SyncColumn? =
-        columnsDictionary.getOrPut(columnName) {
-            this.firstOrNull { c ->
-                c.columnName.equals(
-                    columnName,
-                    true
-                )
-            }
-        }
-//            this.firstOrNull { c -> c.columnName.equals(columnName, true) }
-
-    override fun clear() {
-        //this.forEach { it.clear() }
-        super.clear()
-    }
-}
-
-object SyncColumnsSerializer :
-    ArrayListLikeSerializer<SyncColumns, SyncColumn>(SyncColumn.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt
deleted file mode 100644
index c242e65..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterJoins.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncFilterJoinsSerializer::class)
-class SyncFilterJoins : ArrayList<SyncFilterJoin>() {
-    /**
-     * Filter's schema
-     */
-    @Transient
-    var schema: SyncSet? = null
-
-    /**
-     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
-     */
-    fun ensureFilters(schema: SyncSet) {
-        this.schema = schema
-
-        this.forEach { it.ensureFilterJoin(schema) }
-    }
-}
-
-object SyncFilterJoinsSerializer : ArrayListLikeSerializer<SyncFilterJoins, SyncFilterJoin>(SyncFilterJoin.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt
deleted file mode 100644
index 843ad50..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterParameters.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncFilterParametersSerializer::class)
-class SyncFilterParameters : ArrayList<SyncFilterParameter>() {
-
-    /**
-     * Filter's schema
-     */
-    @Transient
-    var schema: SyncSet? = null
-
-    /**
-     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
-     */
-    fun ensureFilters(schema: SyncSet) {
-        this.schema = schema
-
-        this.forEach { it.ensureFilterParameter(schema) }
-    }
-}
-
-object SyncFilterParametersSerializer : ArrayListLikeSerializer<SyncFilterParameters, SyncFilterParameter>(SyncFilterParameter.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt
deleted file mode 100644
index 6339317..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncFilterWhereSideItems.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncFilterWhereSideItemsSerializer::class)
-class SyncFilterWhereSideItems : ArrayList<SyncFilterWhereSideItem>() {
-    /**
-     * Filter's schema
-     */
-    @Transient
-    var schema: SyncSet? = null
-
-    /**
-     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
-     */
-    fun ensureFilters(schema: SyncSet) {
-        this.schema = schema
-
-        this.forEach { it.ensureFilterWhereSideItem(schema)}
-    }
-}
-
-object SyncFilterWhereSideItemsSerializer : ArrayListLikeSerializer<SyncFilterWhereSideItems, SyncFilterWhereSideItem>(SyncFilterWhereSideItem.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRelations.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRelations.kt
deleted file mode 100644
index ee076ac..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRelations.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SyncRelationsSerializer::class)
-class SyncRelations() : ArrayList<SyncRelation>() {
-    /**
-     * Relation's schema
-     */
-    @Transient
-    var schema: SyncSet? = null
-
-    constructor(schema: SyncSet) : this() {
-        this.schema = schema
-    }
-
-    /**
-     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
-     */
-    fun ensureRelations(schema: SyncSet) {
-        this.schema = schema
-        this.forEach { it.ensureRelation(schema) }
-    }
-
-    override fun clear() {
-        this.forEach { it.clear() }
-        super.clear()
-    }
-}
-
-object SyncRelationsSerializer : ArrayListLikeSerializer<SyncRelations, SyncRelation>(SyncRelation.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRows.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRows.kt
deleted file mode 100644
index 70890ae..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncRows.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-import com.mimetis.dotmim.sync.DataRowState
-import com.mimetis.dotmim.sync.SyncTypeConverter
-
-@Serializable(with = SyncRowsSerializer::class)
-class SyncRows() : ArrayList<SyncRow>() {
-    @Transient
-    var table: SyncTable? = null
-
-    constructor(table: SyncTable) : this() {
-        this.table = table
-    }
-
-    fun ensureRows(table: SyncTable) {
-        this.table = table
-        this.forEach { it.table = table }
-    }
-
-    /**
-     * Import a containerTable
-     */
-    fun importContainerTable(containerTable: ContainerTable, checkType: Boolean) {
-        for (row in containerTable.rows!!) {
-            val length = table!!.columns!!.size
-            val itemArray = Array<Any?>(length) {}
-
-            if (!checkType) {
-                System.arraycopy(row, 1, itemArray, 0, length)
-            } else {
-                // Get only writable columns
-                val columns = table!!.getMutableColumnsWithPrimaryKeys()
-
-                for (col in columns) {
-                    val value = row[col.ordinal + 1]
-                    val colDataType = col.getDataType()
-
-                    if (value == null)
-                        itemArray[col.ordinal] = null
-                    else if (value::class.java != colDataType)
-                        itemArray[col.ordinal] =
-                            SyncTypeConverter.tryConvertTo(value, col.getDataType())
-                    else
-                        itemArray[col.ordinal] = value
-                }
-            }
-
-            //Array.Copy(row, 1, itemArray, 0, length);
-            val state = DataRowState.values().first { it.value == row[0] as Int }
-
-            val schemaRow = SyncRow(this.table!!, itemArray, state)
-            this.add(schemaRow)
-        }
-    }
-
-    /**
-     * Gets the inner rows for serialization
-     */
-    fun exportToContainerTable(): List<Array<Any?>> =
-        this.map { row -> row.toArray() }
-
-    override fun clear() {
-        this.forEach { it.clear() }
-        super.clear()
-    }
-}
-
-object SyncRowsSerializer : ArrayListLikeSerializer<SyncRows, SyncRow>(SyncRow.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTables.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTables.kt
deleted file mode 100644
index dabf353..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/set/SyncTables.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.mimetis.dotmim.sync.set
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.Transient
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-import com.mimetis.dotmim.sync.builders.ParserName
-
-@Serializable(with = SyncTablesSerializer::class)
-class SyncTables() : ArrayList<SyncTable>() {
-    /**
-     * Table's schema
-     */
-    @Transient
-    var schema: SyncSet? = null
-
-    constructor(schema: SyncSet) : this() {
-        this.schema = schema
-    }
-
-    /**
-     * Since we don't serializer the reference to the schema, this method will reaffect the correct schema
-     */
-    fun ensureTables(schema: SyncSet) {
-        this.schema = schema
-        this.forEach { it.ensureTable(schema) }
-    }
-
-    override fun clear() {
-        this.forEach { it.clear() }
-        super.clear()
-    }
-
-    override fun add(element: SyncTable): Boolean {
-        element.schema = schema
-        return super.add(element)
-    }
-
-    /**
-     * Get a table by its name
-     */
-    operator fun get(tableName: String, schemaName: String): SyncTable? {
-        if (tableName.isBlank())
-            throw Exception("`tableName' parameter in empty ($tableName)")
-
-        val parser = ParserName.parse(tableName)
-        val tblName = parser.objectName
-
-        val scn = if (schemaName.isBlank()) "" else schemaName
-        val table = this.firstOrNull { innerTable ->
-            val innerTableSchemaName = if (innerTable.schemaName.isBlank()) "" else innerTable.schemaName
-            return@firstOrNull innerTable.tableName.equals(tblName, true) && innerTableSchemaName.equals(scn, true)
-
-        }
-        return table
-    }
-}
-
-object SyncTablesSerializer : ArrayListLikeSerializer<SyncTables, SyncTable>(SyncTable.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupColumns.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupColumns.kt
deleted file mode 100644
index 62ea072..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupColumns.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.mimetis.dotmim.sync.setup
-
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.builtins.serializer
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SetupColumnsSerializer::class)
-class SetupColumns : ArrayList<String>()
-
-object SetupColumnsSerializer : ArrayListLikeSerializer<SetupColumns, String>(String.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilters.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilters.kt
deleted file mode 100644
index 901282a..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupFilters.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.mimetis.dotmim.sync.setup
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-@Serializable(with = SetupFiltersSerializer::class)
-class SetupFilters : ArrayList<SetupFilter>()
-
-object SetupFiltersSerializer : ArrayListLikeSerializer<SetupFilters, SetupFilter>(SetupFilter.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupTables.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupTables.kt
deleted file mode 100644
index ff58caa..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/setup/SetupTables.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.mimetis.dotmim.sync.setup
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.ArrayListLikeSerializer
-
-/**
- * Represents a list of tables to be added to the sync process
- */
-@Serializable(with = SetupTablesSerializer::class)
-class SetupTables : ArrayList<SetupTable>() {
-    /**
-     * Get a table by its name
-     */
-    operator fun get(tableName: String, schemaName: String): SetupTable? {
-        if (tableName.isBlank())
-            throw Exception("`tableName' parameter in empty ($tableName)")
-
-        val scn = if (schemaName.isBlank()) "" else schemaName
-        val table = this.firstOrNull { innerTable ->
-            val innerTableSchemaName = if (innerTable.schemaName.isBlank()) "" else innerTable.schemaName
-            return@firstOrNull innerTable.tableName.equals(tableName, true) && innerTableSchemaName.equals(scn, true)
-
-        }
-        return table
-    }
-}
-
-object SetupTablesSerializer : ArrayListLikeSerializer<SetupTables, SetupTable>(SetupTable.serializer())
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt
deleted file mode 100644
index 737a036..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/CursorHelper.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.mimetis.dotmim.sync.sqlite
-
-import android.database.Cursor
-import android.database.Cursor.*
-import androidx.core.database.*
-
-object CursorHelper {
-    fun Cursor.getValue(columnIndex: Int): Any? =
-            when (this.getType(columnIndex)) {
-                FIELD_TYPE_NULL -> null
-                FIELD_TYPE_INTEGER -> this.getIntOrNull(columnIndex)
-                FIELD_TYPE_FLOAT -> this.getDoubleOrNull(columnIndex)
-                FIELD_TYPE_STRING -> this.getStringOrNull(columnIndex)
-                FIELD_TYPE_BLOB -> this.getBlobOrNull(columnIndex)
-                else -> null
-            }
-
-    fun Int.getDataType(): Class<*> =
-            when (this) {
-                FIELD_TYPE_INTEGER -> Long::class.java
-                FIELD_TYPE_STRING -> String::class.java
-                FIELD_TYPE_FLOAT -> Double::class.java
-                FIELD_TYPE_BLOB -> ByteArray::class.java
-                else -> Any::class.java
-            }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt
deleted file mode 100644
index 4ec229c..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/sqlite/SqliteScopeBuilder.kt
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.mimetis.dotmim.sync.sqlite
-
-import android.database.Cursor
-import android.database.sqlite.SQLiteDatabase
-import androidx.core.database.getStringOrNull
-import com.mimetis.dotmim.sync.SyncVersion
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import com.mimetis.dotmim.sync.builders.DbScopeBuilder
-import com.mimetis.dotmim.sync.scopes.ScopeInfo
-import com.mimetis.dotmim.sync.set.SyncSet
-import com.mimetis.dotmim.sync.setup.SyncSetup
-import java.util.*
-import kotlin.collections.ArrayList
-
-class SqliteScopeBuilder(
-    scopeInfoTableName: String,
-    private val database: SQLiteDatabase
-) : DbScopeBuilder(scopeInfoTableName) {
-
-    private val json = Json {
-        ignoreUnknownKeys = true
-        isLenient = true
-    }
-
-    override fun existsScopeInfoTable(): Boolean =
-        database.rawQuery(
-            "SELECT count(*) FROM sqlite_master WHERE type='table' AND name='${scopeInfoTableName.unquoted()}'",
-            null
-        ).use { cursor ->
-            cursor.moveToNext() && cursor.getInt(0) > 0
-        }
-
-
-    override fun createScopeInfoTable() {
-        database.execSQL(
-            """CREATE TABLE ${scopeInfoTableName.unquoted()}(
-                         sync_scope_id blob NOT NULL PRIMARY KEY,
-                         sync_scope_name text NOT NULL,
-                         sync_scope_schema text NULL,
-                         sync_scope_setup text NULL,
-                         sync_scope_version text NULL,
-                         scope_last_server_sync_timestamp integer NULL,
-                         scope_last_sync_timestamp integer NULL,
-                         scope_last_sync_duration integer NULL,
-                         scope_last_sync datetime NULL
-                        )"""
-        )
-    }
-
-    override fun getAllScopes(scopeName: String): MutableList<ScopeInfo> =
-        database.rawQuery(
-            """SELECT sync_scope_id
-                            , sync_scope_name
-                            , sync_scope_schema
-                            , sync_scope_setup
-                            , sync_scope_version
-                            , scope_last_sync
-                            , scope_last_server_sync_timestamp
-                            , scope_last_sync_timestamp
-                            , scope_last_sync_duration
-                            FROM ${scopeInfoTableName.unquoted()}
-                            WHERE sync_scope_name = ?""",
-            arrayOf(scopeName)
-        ).use { cursor ->
-            ArrayList<ScopeInfo>().apply {
-                while (cursor.moveToNext()) {
-                    add(readScope(cursor, json))
-                }
-            }
-        }
-
-    override fun existsScopeInfo(scopeId: UUID): Boolean =
-        database.rawQuery(
-            "Select count(*) from ${scopeInfoTableName.unquoted()} where sync_scope_id=?",
-            arrayOf(scopeId.toString())
-        ).use { cursor ->
-            cursor.moveToNext() && cursor.getInt(0) > 0
-        }
-
-    override fun insertScope(scopeInfo: ScopeInfo): ScopeInfo {
-        database.execSQL(
-            "Insert into ${scopeInfoTableName.unquoted()} (sync_scope_name, sync_scope_schema, sync_scope_setup, sync_scope_version, scope_last_sync, scope_last_sync_duration, scope_last_server_sync_timestamp, scope_last_sync_timestamp, sync_scope_id) values(?,?,?,?,?,?,?,?,?)",
-            arrayOf(
-                scopeInfo.name,
-                if (scopeInfo.schema != null) json.encodeToString(scopeInfo.schema) else null,
-                if (scopeInfo.setup != null) json.encodeToString(scopeInfo.setup) else null,
-                scopeInfo.version,
-                scopeInfo.lastSync?.toString(),
-                scopeInfo.lastSyncDuration.toString(),
-                scopeInfo.lastServerSyncTimestamp?.toString(),
-                scopeInfo.lastSyncTimestamp?.toString(),
-                scopeInfo.id.toString()
-            )
-        )
-        return getAllScopes(scopeInfo.name).first()
-    }
-
-    override fun updateScope(scopeInfo: ScopeInfo): ScopeInfo {
-        database.execSQL(
-            "Update ${scopeInfoTableName.unquoted()} set sync_scope_name=?, sync_scope_schema=?, sync_scope_setup=?, sync_scope_version=?, scope_last_sync=?, scope_last_server_sync_timestamp=?, scope_last_sync_timestamp=?, scope_last_sync_duration=? where sync_scope_id=?",
-            arrayOf(
-                scopeInfo.name,
-                if (scopeInfo.schema != null) json.encodeToString(scopeInfo.schema) else null,
-                if (scopeInfo.setup != null) json.encodeToString(scopeInfo.setup) else null,
-                scopeInfo.version,
-                scopeInfo.lastSync?.toString(),
-                scopeInfo.lastServerSyncTimestamp?.toString(),
-                scopeInfo.lastSyncTimestamp?.toString(),
-                scopeInfo.lastSyncDuration.toString(),
-                scopeInfo.id.toString()
-            )
-        )
-        return getAllScopes(scopeInfo.name).first()
-    }
-
-    override fun getLocalTimestamp(): Long =
-        database.rawQuery("Select " + SqliteTableBuilder.TimestampValue, null).use { cursor ->
-            if (cursor.moveToNext())
-                cursor.getLong(0)
-            else
-                0L
-        }
-
-    override fun dropScopeInfoTable() {
-        database.execSQL("DROP Table ${scopeInfoTableName.unquoted()}")
-    }
-
-    private fun readScope(cursor: Cursor, json: Json) =
-        ScopeInfo(
-            id = UUID.fromString(cursor.getString(cursor.getColumnIndex("sync_scope_id"))),
-            name = cursor.getString(cursor.getColumnIndex("sync_scope_name")),
-            schema = if (cursor.isNull(cursor.getColumnIndex("sync_scope_schema"))) null else json.decodeFromString<SyncSet>(
-                cursor.getString(cursor.getColumnIndex("sync_scope_schema"))
-            ),
-            setup = if (cursor.isNull(cursor.getColumnIndex("sync_scope_setup"))) null else json.decodeFromString<SyncSetup>(
-                cursor.getString(cursor.getColumnIndex("sync_scope_setup"))
-            ),
-            version = cursor.getStringOrNull(cursor.getColumnIndex("sync_scope_version")) ?: SyncVersion.current,
-            lastSync = if (cursor.isNull(cursor.getColumnIndex("scope_last_sync"))) null else cursor.getLong(
-                cursor.getColumnIndex("scope_last_sync")
-            ),
-            lastServerSyncTimestamp = if (cursor.isNull(cursor.getColumnIndex("scope_last_server_sync_timestamp"))) null else cursor.getLong(
-                cursor.getColumnIndex("scope_last_server_sync_timestamp")
-            ),
-            lastSyncTimestamp = if (cursor.isNull(cursor.getColumnIndex("scope_last_sync_timestamp"))) null else cursor.getLong(
-                cursor.getColumnIndex("scope_last_sync_timestamp")
-            ),
-            lastSyncDuration = if (cursor.isNull(cursor.getColumnIndex("scope_last_sync_duration"))) 0 else cursor.getLong(
-                cursor.getColumnIndex("scope_last_sync_duration")
-            ),
-            isNewScope = false
-        )
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt
deleted file mode 100644
index c55a337..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/DotmimServiceImpl.kt
+++ /dev/null
@@ -1,309 +0,0 @@
-package com.mimetis.dotmim.sync.web.client
-
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-import okhttp3.Interceptor
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.RequestBody.Companion.toRequestBody
-import okio.Buffer
-import retrofit2.Retrofit
-import retrofit2.http.Body
-import retrofit2.http.Header
-import retrofit2.http.POST
-import com.mimetis.dotmim.sync.serialization.Converter
-import com.mimetis.dotmim.sync.web.client.*
-import okhttp3.JavaNetCookieJar
-import ru.gildor.coroutines.okhttp.await
-import java.net.CookieManager
-import java.util.*
-import java.util.concurrent.TimeUnit
-
-class DotmimServiceImpl(
-    val serviceAddress: String
-) {
-    private interface DotmimServiceInternal {
-        @POST("sync")
-        suspend fun ensureSchema(
-            @Header("AuthHeader")
-            authHeader: String,
-
-            @Header("dotmim-sync-session-id")
-            sessionId: String,
-
-            @Header("dotmim-sync-scope-name")
-            scopeName: String,
-
-            @Header("dotmim-sync-step")
-            step: Int,
-
-            @Body
-            args: HttpMessageEnsureScopesRequest,
-
-            @Header("dotmim-sync-converter")
-            converterKey: String? = null
-        ): HttpMessageEnsureSchemaResponse
-
-        @POST("sync")
-        suspend fun ensureScope(
-            @Header("AuthHeader")
-            authHeader: String,
-
-            @Header("dotmim-sync-session-id")
-            sessionId: String,
-
-            @Header("dotmim-sync-scope-name")
-            scopeName: String,
-
-            @Header("dotmim-sync-step")
-            step: Int,
-
-            @Body
-            args: HttpMessageEnsureScopesRequest,
-
-            @Header("dotmim-sync-converter")
-            converterKey: String? = null
-        ): HttpMessageEnsureScopesResponse
-
-        /**
-         * Used for both SendChanges and GetChanges
-         * @see HttpStep.SendChanges
-         * @see HttpStep.GetChanges
-         * @see HttpStep.GetSnapshot
-         * @see HttpStep.GetEstimatedChangesCount
-         */
-        @POST("sync")
-        suspend fun changes(
-            @Header("AuthHeader")
-            authHeader: String,
-
-            @Header("dotmim-sync-session-id")
-            sessionId: String,
-
-            @Header("dotmim-sync-scope-name")
-            scopeName: String,
-
-            @Header("dotmim-sync-step")
-            step: Int,
-
-            @Body
-            args: HttpMessageSendChangesRequest,
-
-            @Header("dotmim-sync-converter")
-            converterKey: String? = null
-        ): HttpMessageSummaryResponse
-
-//        @POST("sync")
-//        suspend fun sendMoreChanges(
-//                @Header("AuthHeader")
-//                authHeader: String,
-//
-//                @Header("dotmim-sync-session-id")
-//                sessionId: String,
-//
-//                @Header("dotmim-sync-scope-name")
-//                scopeName: String,
-//
-//                @Header("dotmim-sync-step")
-//                step: Int,
-//
-//                @Body
-//                args: HttpMessageGetMoreChangesRequest,
-//
-//                @Header("dotmim-sync-converter")
-//                converterKey: String? = null
-//        ): HttpMessageSendChangesResponse
-
-        @POST("sync")
-        suspend fun endOfDownloadChanges(
-            @Header("AuthHeader")
-            authHeader: String,
-
-            @Header("dotmim-sync-session-id")
-            sessionId: String,
-
-            @Header("dotmim-sync-scope-name")
-            scopeName: String,
-
-            @Header("dotmim-sync-step")
-            step: Int,
-
-            @Body
-            args: HttpMessageGetMoreChangesRequest,
-
-            @Header("dotmim-sync-converter")
-            converterKey: String? = null
-        )
-
-        @POST("sync")
-        suspend fun summary(
-            @Header("AuthHeader")
-            authHeader: String,
-
-            @Header("dotmim-sync-session-id")
-            sessionId: String,
-
-            @Header("dotmim-sync-scope-name")
-            scopeName: String,
-
-            @Header("dotmim-sync-step")
-            step: Int,
-
-            @Body
-            args: HttpMessageSendChangesRequest,
-
-            @Header("dotmim-sync-converter")
-            converterKey: String? = null
-        ): HttpMessageSummaryResponse
-    }
-
-    private val okHttpClient: OkHttpClient
-    private val json = Json {
-        ignoreUnknownKeys = true
-        isLenient = true
-    }
-
-    private var service: DotmimServiceInternal
-
-    suspend fun ensureScope(
-        authHeader: String,
-        args: HttpMessageEnsureScopesRequest,
-        converter: Converter?
-    ): HttpMessageEnsureScopesResponse =
-        service.ensureScope(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.EnsureScopes.value,
-            args,
-            converter?.key
-        )
-
-    suspend fun ensureSchema(
-        authHeader: String,
-        args: HttpMessageEnsureScopesRequest,
-        converter: Converter?
-    ): HttpMessageEnsureSchemaResponse =
-        service.ensureSchema(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.EnsureSchema.value,
-            args,
-            converter?.key
-        )
-
-    suspend fun getSnapshot(
-        authHeader: String,
-        args: HttpMessageSendChangesRequest,
-        converter: Converter?
-    ): HttpMessageSummaryResponse =
-        service.changes(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.GetSnapshot.value,
-            args,
-            converter?.key
-        )
-
-    suspend fun sendChanges(
-        authHeader: String,
-        args: HttpMessageSendChangesRequest,
-        converter: Converter?
-    ): HttpMessageSummaryResponse =
-        service.changes(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.SendChangesInProgress.value,
-            args,
-            converter?.key
-        )
-
-    suspend fun moreChanges(
-        authHeader: String,
-        args: HttpMessageGetMoreChangesRequest,
-        converter: Converter?
-    ): ByteArray {
-        val requestBuilder = Request.Builder()
-            .url("${serviceAddress}sync")
-            .header("AuthHeader", authHeader)
-            .header("dotmim-sync-session-id", args.syncContext.sessionId.toString())
-            .header("dotmim-sync-scope-name", args.syncContext.scopeName)
-            .header("dotmim-sync-step", HttpStep.GetSummary.value.toString())
-            .post(json.encodeToString(args).toRequestBody("application/json".toMediaType()))
-        if (converter != null)
-            requestBuilder.header("dotmim-sync-converter", converter.key)
-        val response = okHttpClient.newCall(requestBuilder.build()).await()
-        return response.body!!.bytes()
-//        return service.sendMoreChanges(authHeader, args.syncContext.sessionId.toString(), args.syncContext.scopeName, HttpStep.GetMoreChanges.value, args, converter?.key)
-    }
-
-    suspend fun endDownloadChanges(
-        authHeader: String,
-        args: HttpMessageGetMoreChangesRequest,
-        converter: Converter?
-    ) {
-        service.endOfDownloadChanges(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.SendEndDownloadChanges.value,
-            args,
-            converter?.key
-        )
-    }
-
-    suspend fun getSummary(
-        authHeader: String,
-        args: HttpMessageSendChangesRequest,
-        converter: Converter?
-    ): HttpMessageSummaryResponse =
-        service.summary(
-            authHeader,
-            args.syncContext.sessionId.toString(),
-            args.syncContext.scopeName,
-            HttpStep.GetSummary.value,
-            args,
-            converter?.key
-        )
-
-    init {
-        okHttpClient = OkHttpClient.Builder()
-            .connectTimeout(10, TimeUnit.SECONDS)
-            .readTimeout(300, TimeUnit.SECONDS)
-            .cookieJar(JavaNetCookieJar(CookieManager()))
-            .addInterceptor { chain: Interceptor.Chain ->
-                val buffer = Buffer()
-                chain.request().body?.writeTo(buffer)
-                val bodyHash = buffer.sha256().base64()
-                val authHeader = chain.request().header("AuthHeader") ?: ""
-                val request = chain.request().newBuilder()
-                    .removeHeader("AuthHeader")
-                    .addHeader("Authorization", authHeader)
-                    .addHeader("dotmim-sync-serialization-format", "{\"f\":\"json\", \"s\":0}")
-                    .addHeader("dotmim-sync-hash", bodyHash)
-                    .build()
-
-                val response = chain.proceed(request)
-//                if (!response.isSuccessful)
-//                    CrashesHelper.logError(response, "DotmimServiceImpl.request")
-
-                return@addInterceptor response
-            }
-            .build()
-        val retrofit = Retrofit.Builder()
-            .baseUrl(serviceAddress)
-            .client(okHttpClient)
-            .addConverterFactory(json.asConverterFactory("application/json".toMediaType()))
-            .build()
-        service = retrofit.create(DotmimServiceInternal::class.java)
-    }
-
-//    companion object {
-//        private val TAG = DotmimServiceImpl::class.java.simpleName
-//    }
-}
diff --git a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpStep.kt b/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpStep.kt
deleted file mode 100644
index 482c1e0..0000000
--- a/dotmimsync/src/main/java/com/mimetis/dotmim/sync/web/client/HttpStep.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.mimetis.dotmim.sync.web.client
-
-import kotlinx.serialization.Serializable
-import com.mimetis.dotmim.sync.data.EnumByValueSerializer
-import com.mimetis.dotmim.sync.data.EnumWithValue
-
-class HttpStepSerializer : EnumByValueSerializer<HttpStep>()
-
-@Serializable(with = HttpStepSerializer::class)
-enum class HttpStep(override val value: Int) : EnumWithValue {
-    None(0),
-    EnsureSchema(1),
-    EnsureScopes(2),
-    SendChanges(3),
-    SendChangesInProgress(4),
-    GetChanges(5),
-    GetEstimatedChangesCount(6),
-    GetMoreChanges(7),
-    GetChangesInProgress(8),
-    GetSnapshot(9),
-    GetSummary(10),
-    SendEndDownloadChanges(1)
-}
diff --git a/dotmimsync/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt b/dotmimsync/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt
deleted file mode 100644
index 94e406f..0000000
--- a/dotmimsync/src/test/java/com/mimetis/dotmimsync/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.mimetis.dotmimsync
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
\ No newline at end of file
diff --git a/dotmimsync/src/test/java/com/mimetis/dotmimsync/PrimitiveSerializerUnitTest.kt b/dotmimsync/src/test/java/com/mimetis/dotmimsync/PrimitiveSerializerUnitTest.kt
deleted file mode 100644
index 935d173..0000000
--- a/dotmimsync/src/test/java/com/mimetis/dotmimsync/PrimitiveSerializerUnitTest.kt
+++ /dev/null
@@ -1,176 +0,0 @@
-package com.mimetis.dotmimsync
-
-import android.util.Base64
-import com.mimetis.dotmim.sync.PrimitiveSerializer
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonDecoder
-import kotlinx.serialization.json.encodeToJsonElement
-import org.junit.Assert
-import org.junit.Test
-import org.junit.runner.RunWith
-import org.mockito.ArgumentMatchers
-import org.mockito.Mockito
-import org.powermock.api.mockito.PowerMockito
-import org.powermock.core.classloader.annotations.PrepareForTest
-import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
-
-@RunWith(PowerMockRunner::class)
-@PrepareForTest(Base64::class)
-class PrimitiveSerializerUnitTest {
-    @Test
-    fun `should return String for base64`() {
-        val data = arrayOf<Byte>(1, 2, 3, 4, 5, 6, 7, 8, 9, 10).toByteArray()
-        val input = "AQIDBAUGBwgJCg=="
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(input)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        PowerMockito.mockStatic(Base64::class.java)
-        Mockito.`when`(Base64.decode(ArgumentMatchers.anyString(), ArgumentMatchers.anyInt())).thenReturn(data)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-        Assert.assertEquals(input, result)
-    }
-
-    @Test
-    fun `should return String for guid`() {
-        val uuid = UUID.randomUUID()
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(uuid.toString().lowercase())
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-        Assert.assertEquals(uuid.toString(), result)
-    }
-
-    @Test
-    fun `should return Boolean=true`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(true)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Boolean)
-        Assert.assertTrue(result as Boolean)
-    }
-
-    @Test
-    fun `should return Boolean=false`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(false)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Boolean)
-        Assert.assertFalse(result as Boolean)
-    }
-
-    @Test
-    fun `should return Int`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(14)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Int)
-        Assert.assertEquals(14, result)
-    }
-
-    @Test
-    fun `should return Int for small Long`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(500L)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Int)
-        Assert.assertEquals(500, result)
-    }
-
-    @Test
-    fun `should return Long`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(Int.MAX_VALUE.toLong() + 1L)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Long)
-        Assert.assertEquals(Int.MAX_VALUE.toLong() + 1L, result)
-    }
-
-    @Test
-    fun `should return Double`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(2.6)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Double)
-        Assert.assertEquals(2.6, result)
-    }
-
-    @Test
-    fun `should return Double for Float`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement(1.79f)
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is Double)
-        Assert.assertEquals(1.79, result)
-    }
-
-    @Test
-    fun `should return String`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement("Foo")
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-        Assert.assertEquals("Foo", result)
-    }
-
-    @Test
-    fun `should return String for multiline (n) text starts with number`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement("123\nfff")
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-    }
-
-    @Test
-    fun `should return String for multiline (r) text starts with number1`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement("123\rfff")
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-    }
-
-    @Test
-    fun `should return String for multiline (rn) text starts with number`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement("123\r\nfff")
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-    }
-
-    @Test
-    fun `should return String for text starts with the number`() {
-        val decoderMock = Mockito.mock(JsonDecoder::class.java)
-        val element = Json.encodeToJsonElement("98751 км")
-        Mockito.`when`(decoderMock.decodeJsonElement()).thenReturn(element)
-
-        val result = PrimitiveSerializer.deserialize(decoderMock)
-        Assert.assertTrue(result is String)
-    }
-}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 98bed16..de37871 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,21 +1,13 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app"s APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.caching=true
+org.gradle.configuration-cache=true
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+android.nonTransitiveRClass=true
+
+versionSuffix=
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..c60cd30
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,30 @@
+[versions]
+agp = "8.13.2"
+kotlin = "2.3.0"
+serialization = "1.9.0"
+kotlinx-datetime = "0.7.1"
+sqlite = "2.6.2"
+ktor = "3.3.3"
+vanniktech = "0.35.0"
+bignum = "0.3.10"
+
+[libraries]
+kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
+
+jetbrains-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
+jetbrains-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
+
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
+
+androidx-sqlite-bundled = { module = "androidx.sqlite:sqlite-bundled", version.ref = "sqlite" }
+
+ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
+
+kotlin-bignum = { module = "com.ionspin.kotlin:bignum", version.ref = "bignum" }
+kotlin-bignum-serialization = { module = "com.ionspin.kotlin:bignum-serialization-kotlinx", version.ref = "bignum" }
+
+[plugins]
+androidLibrary = { id = "com.android.library", version.ref = "agp" }
+kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
+jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index de86aa6..83de9b3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 05 21:57:27 CET 2021
+#Sun Dec 01 10:12:16 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index cb4744f..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-//dependencyResolutionManagement {
-//    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-//    repositories {
-//        google()
-//        mavenCentral()
-//        jcenter() // Warning: this repository is going to shut down soon
-//    }
-//}
-//rootProject.name = "dotmimsync"
-include ':app'
-include ':dotmimsync'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..e5c0297
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,26 @@
+enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://jitpack.io")
+    }
+
+    versionCatalogs {
+        create("kotlincrypto") {
+            // https://github.com/KotlinCrypto/version-catalog/blob/master/gradle/kotlincrypto.versions.toml
+            from("org.kotlincrypto:version-catalog:0.8.0")
+        }
+    }
+}
+
+rootProject.name = "dotmimsync"
+include(":dotmimsync-core")
\ No newline at end of file