diff --git a/src/api/model/ApiObject.kt b/src/api/model/ApiObject.kt
index 3a9e41b..10279f4 100644
--- a/src/api/model/ApiObject.kt
+++ b/src/api/model/ApiObject.kt
@@ -2,9 +2,10 @@ package com.kmalbz.api.model
 
 import com.google.gson.annotations.SerializedName
 import java.time.LocalDate
+import java.util.*
 
 data class ApiObject(
-    @SerializedName("tag") val tag: String,
+    @SerializedName("tag") val tag: UUID,
     @SerializedName("date") val date: LocalDate,
     @SerializedName("device_id") val device_id: String
 
diff --git a/src/api/route/InputServiceServer.kt b/src/api/route/InputServiceServer.kt
index 9e646fe..0c86f20 100644
--- a/src/api/route/InputServiceServer.kt
+++ b/src/api/route/InputServiceServer.kt
@@ -98,7 +98,7 @@ class InputServiceServer {
             if (description == null || soundFile == null)
                 call.respond(HttpStatusCode.ExpectationFailed)
 
-            val tag = UUID.randomUUID().toString()
+            val tag = UUID.randomUUID()
 
             val currentApiObject = ApiObject(tag = tag, date = LocalDate.now(), device_id = description!!.device_id)
 
@@ -108,7 +108,7 @@ class InputServiceServer {
 
             connection.confirmChannel {
                 publish {
-                    publishWithConfirm(OutboundMessage(rabbitExchangeName, "", MessageProperties.PERSISTENT_BASIC, tag))
+                    publishWithConfirm(OutboundMessage(rabbitExchangeName, "", MessageProperties.PERSISTENT_BASIC, tag.toString()))
                 }
             }
 
diff --git a/src/database/dao/InputObjects.kt b/src/database/dao/InputObjects.kt
index 539a653..d07beae 100644
--- a/src/database/dao/InputObjects.kt
+++ b/src/database/dao/InputObjects.kt
@@ -4,9 +4,10 @@ import org.jetbrains.exposed.dao.id.IntIdTable
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.`java-time`.date
 import java.time.LocalDate
+import java.util.*
 
 object InputObjects : IntIdTable() {
-    val tag: Column<String> = varchar("tag",32)
+    val tag: Column<UUID> = uuid("tag")
     val date: Column<LocalDate> = date("date").default(LocalDate.now())
     val device_id: Column<String> = varchar("device_id", 32)
     override val primaryKey = PrimaryKey(id, name = "PK_ResultObject_Id")