diff --git a/akka-http/src/test/scala/com/github/fsanaulla/chronicler/akka/utils/TestHelper.scala b/akka-http/src/test/scala/com/github/fsanaulla/chronicler/akka/utils/TestHelper.scala
index e44ad1ef..106a71f2 100644
--- a/akka-http/src/test/scala/com/github/fsanaulla/chronicler/akka/utils/TestHelper.scala
+++ b/akka-http/src/test/scala/com/github/fsanaulla/chronicler/akka/utils/TestHelper.scala
@@ -1,9 +1,9 @@
 package com.github.fsanaulla.chronicler.akka.utils
 
 import akka.http.scaladsl.model.Uri
+import com.github.fsanaulla.chronicler.macros.Macros
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag}
 import com.github.fsanaulla.core.model._
-import com.github.fsanaulla.macros.Macros
-import com.github.fsanaulla.macros.annotations.{field, tag}
 
 /**
   * Created by fayaz on 11.07.17.
diff --git a/async-http/src/test/scala/com/github/fsanaulla/chronicler/async/utils/TestHelper.scala b/async-http/src/test/scala/com/github/fsanaulla/chronicler/async/utils/TestHelper.scala
index 08ad2a55..f2de8239 100644
--- a/async-http/src/test/scala/com/github/fsanaulla/chronicler/async/utils/TestHelper.scala
+++ b/async-http/src/test/scala/com/github/fsanaulla/chronicler/async/utils/TestHelper.scala
@@ -2,9 +2,9 @@ package com.github.fsanaulla.chronicler.async.utils
 
 import java.net.URLEncoder
 
+import com.github.fsanaulla.chronicler.macros.Macros
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag}
 import com.github.fsanaulla.core.model._
-import com.github.fsanaulla.macros.Macros
-import com.github.fsanaulla.macros.annotations.{field, tag}
 
 /**
   * Created by fayaz on 11.07.17.
diff --git a/core/src/main/scala/com/github/fsanaulla/core/model/InfluxPoint.scala b/core/src/main/scala/com/github/fsanaulla/core/model/InfluxPoint.scala
index 11378f56..1af1ee09 100644
--- a/core/src/main/scala/com/github/fsanaulla/core/model/InfluxPoint.scala
+++ b/core/src/main/scala/com/github/fsanaulla/core/model/InfluxPoint.scala
@@ -64,7 +64,7 @@ final case class Point(
     sb.append(measurement).append(",")
     sb.append(tags.map(tag => tag.key + "=" + tag.value).mkString(","))
     sb.append(" ")
-    sb.append(fields.map(_.toString).mkString(" "))
+    sb.append(fields.map(_.toString).mkString(","))
 
     if (time != -1L) {
       sb.append(" ").append(time)
diff --git a/core/src/test/scala/com/gtihub/fsanaulla/chronicler/core/PointSpec.scala b/core/src/test/scala/com/gtihub/fsanaulla/chronicler/core/PointSpec.scala
index eec9b00e..bff6337d 100644
--- a/core/src/test/scala/com/gtihub/fsanaulla/chronicler/core/PointSpec.scala
+++ b/core/src/test/scala/com/gtihub/fsanaulla/chronicler/core/PointSpec.scala
@@ -17,6 +17,6 @@ class PointSpec extends FlatSpec with Matchers {
       .addField("weight", 75.6)
       .addTimestamp(ts)
 
-    p.serialize shouldEqual "test,city=London name=\"Jivi\" age=22i adult=true weight=75.6" + s" $ts"
+    p.serialize shouldEqual "test,city=London name=\"Jivi\",age=22i,adult=true,weight=75.6" + s" $ts"
   }
 }
diff --git a/macros/src/main/scala/com/github/fsanaulla/macros/Macros.scala b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/Macros.scala
similarity index 92%
rename from macros/src/main/scala/com/github/fsanaulla/macros/Macros.scala
rename to macros/src/main/scala/com/github/fsanaulla/chronicler/macros/Macros.scala
index 5f6fb86c..fa8ae8b3 100644
--- a/macros/src/main/scala/com/github/fsanaulla/macros/Macros.scala
+++ b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/Macros.scala
@@ -1,4 +1,4 @@
-package com.github.fsanaulla.macros
+package com.github.fsanaulla.chronicler.macros
 
 import com.github.fsanaulla.core.model.{InfluxFormatter, InfluxReader, InfluxWriter}
 
diff --git a/macros/src/main/scala/com/github/fsanaulla/macros/MacrosImpl.scala b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/MacrosImpl.scala
similarity index 98%
rename from macros/src/main/scala/com/github/fsanaulla/macros/MacrosImpl.scala
rename to macros/src/main/scala/com/github/fsanaulla/chronicler/macros/MacrosImpl.scala
index 3528cf8d..f1567bb9 100644
--- a/macros/src/main/scala/com/github/fsanaulla/macros/MacrosImpl.scala
+++ b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/MacrosImpl.scala
@@ -1,6 +1,6 @@
-package com.github.fsanaulla.macros
+package com.github.fsanaulla.chronicler.macros
 
-import com.github.fsanaulla.macros.annotations.{field, tag, timestamp}
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag, timestamp}
 
 import scala.language.experimental.macros
 import scala.reflect.macros.blackbox
@@ -205,7 +205,7 @@ private[macros] class MacrosImpl(val c: blackbox.Context) {
                   case (k, v: String) => k + "=" + "\"" + v + "\""
                   case (k, v: Int) => k + "=" + v + "i"
                   case (k, v) => k + "=" + v
-                } mkString(" ")
+                } mkString(",")
 
                 val nonOptTagsMap: Map[String, String] = Map(..$nonOptTags)
                 val nonOptTags: String = nonOptTagsMap map {
@@ -228,7 +228,7 @@ private[macros] class MacrosImpl(val c: blackbox.Context) {
                case (k, v: String) => k + "=" + "\"" + v + "\""
                case (k, v: Int) => k + "=" + v + "i"
                case (k, v) => k + "=" + v
-            } mkString(" ")
+            } mkString(",")
 
             val nonOptTagsMap: Map[String, String] = Map(..$nonOptTags)
             val nonOptTags: String = nonOptTagsMap map {
diff --git a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/field.scala b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/field.scala
similarity index 83%
rename from macros/src/main/scala/com/github/fsanaulla/macros/annotations/field.scala
rename to macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/field.scala
index 0f2f1a6d..775bc431 100644
--- a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/field.scala
+++ b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/field.scala
@@ -1,4 +1,4 @@
-package com.github.fsanaulla.macros.annotations
+package com.github.fsanaulla.chronicler.macros.annotations
 
 /***
   * Marker for declaring field value for influx point.
diff --git a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/tag.scala b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/tag.scala
similarity index 78%
rename from macros/src/main/scala/com/github/fsanaulla/macros/annotations/tag.scala
rename to macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/tag.scala
index db6e0507..d210ce69 100644
--- a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/tag.scala
+++ b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/tag.scala
@@ -1,4 +1,4 @@
-package com.github.fsanaulla.macros.annotations
+package com.github.fsanaulla.chronicler.macros.annotations
 
 /***
   * Marker for declaring influx point tag's. Can be only String.
diff --git a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/timestamp.scala b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/timestamp.scala
similarity index 81%
rename from macros/src/main/scala/com/github/fsanaulla/macros/annotations/timestamp.scala
rename to macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/timestamp.scala
index d5f8cffd..c528e82e 100644
--- a/macros/src/main/scala/com/github/fsanaulla/macros/annotations/timestamp.scala
+++ b/macros/src/main/scala/com/github/fsanaulla/chronicler/macros/annotations/timestamp.scala
@@ -1,4 +1,4 @@
-package com.github.fsanaulla.macros.annotations
+package com.github.fsanaulla.chronicler.macros.annotations
 
 /** Mark field that will be used as timestamp in InfluxDB.
   * It can be optional, in this case will be used default
diff --git a/macros/src/test/scala/com/github/fsanaulla/macros/MacroFormatterSpec.scala b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroFormatterSpec.scala
similarity index 90%
rename from macros/src/test/scala/com/github/fsanaulla/macros/MacroFormatterSpec.scala
rename to macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroFormatterSpec.scala
index 9f805e88..ba55701c 100644
--- a/macros/src/test/scala/com/github/fsanaulla/macros/MacroFormatterSpec.scala
+++ b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroFormatterSpec.scala
@@ -1,8 +1,8 @@
-package com.github.fsanaulla.macros
+package com.github.fsanaulla.chronicler.macros
 
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag, timestamp}
 import com.github.fsanaulla.chronicler.testing.FlatSpecWithMatchers
 import com.github.fsanaulla.core.model.InfluxFormatter
-import com.github.fsanaulla.macros.annotations.{field, tag, timestamp}
 import jawn.ast.{JArray, JNull, JNum, JString}
 
 class MacroFormatterSpec extends FlatSpecWithMatchers {
diff --git a/macros/src/test/scala/com/github/fsanaulla/macros/MacroReaderSpec.scala b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroReaderSpec.scala
similarity index 90%
rename from macros/src/test/scala/com/github/fsanaulla/macros/MacroReaderSpec.scala
rename to macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroReaderSpec.scala
index 26faf5a0..eea9b91c 100644
--- a/macros/src/test/scala/com/github/fsanaulla/macros/MacroReaderSpec.scala
+++ b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroReaderSpec.scala
@@ -1,8 +1,8 @@
-package com.github.fsanaulla.macros
+package com.github.fsanaulla.chronicler.macros
 
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag, timestamp}
 import com.github.fsanaulla.chronicler.testing.FlatSpecWithMatchers
 import com.github.fsanaulla.core.model.InfluxReader
-import com.github.fsanaulla.macros.annotations.{field, tag, timestamp}
 import jawn.ast._
 
 class MacroReaderSpec extends FlatSpecWithMatchers {
diff --git a/macros/src/test/scala/com/github/fsanaulla/macros/MacroWriterSpec.scala b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroWriterSpec.scala
similarity index 79%
rename from macros/src/test/scala/com/github/fsanaulla/macros/MacroWriterSpec.scala
rename to macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroWriterSpec.scala
index 36558e58..b56a10b3 100644
--- a/macros/src/test/scala/com/github/fsanaulla/macros/MacroWriterSpec.scala
+++ b/macros/src/test/scala/com/github/fsanaulla/chronicler/macros/MacroWriterSpec.scala
@@ -1,8 +1,8 @@
-package com.github.fsanaulla.macros
+package com.github.fsanaulla.chronicler.macros
 
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag, timestamp}
 import com.github.fsanaulla.chronicler.testing.FlatSpecWithMatchers
 import com.github.fsanaulla.core.model.InfluxWriter
-import com.github.fsanaulla.macros.annotations.{field, tag, timestamp}
 
 class MacroWriterSpec extends FlatSpecWithMatchers {
 
@@ -21,14 +21,14 @@ class MacroWriterSpec extends FlatSpecWithMatchers {
   val wr1: InfluxWriter[Test1] = Macros.writer[Test1]
 
   "Macros.writer" should "write with None" in {
-    wr.write(Test("nm", None, "Berkly", 65)) shouldEqual "name=nm school=\"Berkly\" age=65i"
+    wr.write(Test("nm", None, "Berkly", 65)) shouldEqual "name=nm school=\"Berkly\",age=65i"
   }
 
   it should "write with Some" in {
-    wr.write(Test("nm", Some("sn"), "Berkly", 65)) shouldEqual "name=nm,surname=sn school=\"Berkly\" age=65i"
+    wr.write(Test("nm", Some("sn"), "Berkly", 65)) shouldEqual "name=nm,surname=sn school=\"Berkly\",age=65i"
   }
 
   it should "write with timestamp" in {
-    wr1.write(Test1("nm", Some("sn"), 65, "Berkly", 1438715114318570484L)) shouldEqual "name=nm,surname=sn age=65i school=\"Berkly\" 1438715114318570484"
+    wr1.write(Test1("nm", Some("sn"), 65, "Berkly", 1438715114318570484L)) shouldEqual "name=nm,surname=sn age=65i,school=\"Berkly\" 1438715114318570484"
   }
 }
diff --git a/udp/src/test/scala/com/github/fsanaulla/chronicler/udp/UdpClientSpec.scala b/udp/src/test/scala/com/github/fsanaulla/chronicler/udp/UdpClientSpec.scala
index 61177725..18a2166f 100644
--- a/udp/src/test/scala/com/github/fsanaulla/chronicler/udp/UdpClientSpec.scala
+++ b/udp/src/test/scala/com/github/fsanaulla/chronicler/udp/UdpClientSpec.scala
@@ -4,11 +4,11 @@ import java.io.File
 
 import com.github.fsanaulla.chronicler.async.InfluxAsyncHttpClient
 import com.github.fsanaulla.chronicler.async.api.Database
+import com.github.fsanaulla.chronicler.macros.Macros
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag}
 import com.github.fsanaulla.chronicler.testing.{FutureHandler, TestSpec}
 import com.github.fsanaulla.core.model.{InfluxFormatter, Point}
 import com.github.fsanaulla.core.testing.configurations.InfluxUDPConf
-import com.github.fsanaulla.macros.Macros
-import com.github.fsanaulla.macros.annotations.{field, tag}
 import com.github.fsanaulla.scalatest.EmbeddedInfluxDB
 
 import scala.concurrent.ExecutionContext.Implicits.global
diff --git a/url-http/src/test/scala/com/github/fsanaulla/chronicler/urlhttp/utils/TestHelper.scala b/url-http/src/test/scala/com/github/fsanaulla/chronicler/urlhttp/utils/TestHelper.scala
index b35559cf..7efe3a17 100644
--- a/url-http/src/test/scala/com/github/fsanaulla/chronicler/urlhttp/utils/TestHelper.scala
+++ b/url-http/src/test/scala/com/github/fsanaulla/chronicler/urlhttp/utils/TestHelper.scala
@@ -2,9 +2,9 @@ package com.github.fsanaulla.chronicler.urlhttp.utils
 
 import java.net.URLEncoder
 
+import com.github.fsanaulla.chronicler.macros.Macros
+import com.github.fsanaulla.chronicler.macros.annotations.{field, tag}
 import com.github.fsanaulla.core.model._
-import com.github.fsanaulla.macros.Macros
-import com.github.fsanaulla.macros.annotations.{field, tag}
 
 /**
   * Created by fayaz on 11.07.17.
diff --git a/version.sbt b/version.sbt
index 166f9d77..c739badb 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.2.4"
\ No newline at end of file
+version in ThisBuild := "0.2.5"
\ No newline at end of file