diff --git a/build.gradle b/build.gradle
index 664a61e..18275f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,3 @@
-project.version = "0.1.1"
-project.group = "com.insanusmokrassar"
-
 buildscript {
     repositories {
         mavenLocal()
@@ -10,11 +7,20 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
     }
 }
 
-apply plugin: 'kotlin-multiplatform'
+plugins {
+    id "org.jetbrains.kotlin.multiplatform" version "$kotlin_version"
+    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
+}
+
+project.version = "$project_public_version"
+project.group = "$project_public_group"
+
+apply from: "publish.gradle"
 
 repositories {
     mavenLocal()
@@ -25,24 +31,34 @@ repositories {
 
 kotlin {
     jvm()
-    
+
     sourceSets {
         commonMain {
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version"
+                implementation kotlin('stdlib')
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$kotlin_coroutines_version"
 
                 api "com.soywiz.korlibs.klock:klock:$klockVersion"
             }
         }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+            }
+        }
         jvmMain {
             dependencies {
-                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
 
-                api "com.soywiz.korlibs.klock:klock:$klockVersion"
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
             }
         }
     }
 }
-
-apply from: "publish.gradle"
diff --git a/gradle.properties b/gradle.properties
index 98c95bc..6cd2aa8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,6 +7,8 @@ gradle_bintray_plugin_version=1.8.4
 klockVersion=1.7.3
 
 project_bintray_repo=InsanusMokrassar
+project_public_version=0.1.1
+project_public_group=com.insanusmokrassar
 project_public_name=Krontab
 project_public_description=It is analog of crontab util for Kotlin Coroutines
 project_url=https://git.insanusmokrassar.com/InsanusMokrassar/krontab