diff --git a/src/Database.T4/DataModel/CsDatabase.tt b/src/Database.T4/DataModel/CsDatabase.tt
index 16b35eac70bffc7e17fedbe1a6b212e1be71d936..a64f6f5466447978968e4267c9ea1b058138aa04 100644
--- a/src/Database.T4/DataModel/CsDatabase.tt
+++ b/src/Database.T4/DataModel/CsDatabase.tt
@@ -4,7 +4,7 @@
 <#@ include file="$(ProjectDir)\LinqToDB.Templates\PluralizationService.ttinclude"     #>
 
 <#@ assembly name="$(ProjectDir)..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll"#>
-<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll" #>
+<#@ assembly name="$(ProjectDir)..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll" #>
 <#@ assembly name="$(ProjectDir)..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll" #>
 
 <#@ assembly name="$(ProjectDir)..\packages\Microsoft.Extensions.DependencyInjection.2.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.dll"#>
diff --git a/src/Database.T4/Database.T4.csproj b/src/Database.T4/Database.T4.csproj
index c001669031ba58ac307d73277a18ab026444a22e..68ad37c9b4bd791f3a020f8489c0a9c80fb782ce 100644
--- a/src/Database.T4/Database.T4.csproj
+++ b/src/Database.T4/Database.T4.csproj
@@ -50,7 +50,7 @@
       <HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll</HintPath>
+      <HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll</HintPath>
     </Reference>
     <Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
diff --git a/src/Database.T4/Properties/AssemblyInfo.cs b/src/Database.T4/Properties/AssemblyInfo.cs
index 0d14773d2f6768d010bb7a752e0b4744ce6ea0b8..ed85e56afd98a4c5320b70ea175420f3957edff7 100644
--- a/src/Database.T4/Properties/AssemblyInfo.cs
+++ b/src/Database.T4/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database.T4")]
 [assembly: AssemblyVersion("1.25.0")]
 [assembly: AssemblyFileVersion("1.25.0")]
-[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database.T4/packages.config b/src/Database.T4/packages.config
index a4e618c1b4e31fe6a95852f7c2071d74a3dc01b8..214b163b4b37cb27332d9043d3993bc7a71f4318 100644
--- a/src/Database.T4/packages.config
+++ b/src/Database.T4/packages.config
@@ -3,7 +3,7 @@
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
   <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
   <package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
-  <package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0002" targetFramework="net461" />
+  <package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0005" targetFramework="net461" />
   <package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
   <package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
   <package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
diff --git a/src/Database.Tests/Database.Tests.csproj b/src/Database.Tests/Database.Tests.csproj
index e628debf6529f242e780990e9c035428dc04b3e3..707127c69b0b6981c2681e067d05cbbf8ce1c3b3 100644
--- a/src/Database.Tests/Database.Tests.csproj
+++ b/src/Database.Tests/Database.Tests.csproj
@@ -44,7 +44,7 @@
       <HintPath>..\packages\Coscine.Database.Helpers.1.1.0\lib\net461\Coscine.Database.Helpers.dll</HintPath>
     </Reference>
     <Reference Include="Coscine.Migrations, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0002\lib\net461\Coscine.Migrations.dll</HintPath>
+      <HintPath>..\packages\Coscine.Migrations.1.8.0-topic-1051-basic0005\lib\net461\Coscine.Migrations.dll</HintPath>
     </Reference>
     <Reference Include="FluentMigrator, Version=3.2.8.0, Culture=neutral, PublicKeyToken=aacfc7de5acabf05, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentMigrator.3.2.8\lib\net461\FluentMigrator.dll</HintPath>
diff --git a/src/Database.Tests/Properties/AssemblyInfo.cs b/src/Database.Tests/Properties/AssemblyInfo.cs
index 06d2f9a8f5153a063487f84cc30f0f360564dfa3..afd30f232d6e3202ff6eacc7d40213501b7ba5aa 100644
--- a/src/Database.Tests/Properties/AssemblyInfo.cs
+++ b/src/Database.Tests/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database.Tests")]
 [assembly: AssemblyVersion("1.25.0")]
 [assembly: AssemblyFileVersion("1.25.0")]
-[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database.Tests/packages.config b/src/Database.Tests/packages.config
index 257aed0f5d30a75d5b9b09ac015561751f757672..c2e7cbbecba714b370a3ce09a196a1de591d322a 100644
--- a/src/Database.Tests/packages.config
+++ b/src/Database.Tests/packages.config
@@ -3,7 +3,7 @@
   <package id="Consul" version="0.7.2.6" targetFramework="net461" />
   <package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
   <package id="Coscine.Database.Helpers" version="1.1.0" targetFramework="net461" />
-  <package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0002" targetFramework="net461" />
+  <package id="Coscine.Migrations" version="1.8.0-topic-1051-basic0005" targetFramework="net461" />
   <package id="FluentMigrator" version="3.2.8" targetFramework="net461" />
   <package id="FluentMigrator.Abstractions" version="3.2.8" targetFramework="net461" />
   <package id="FluentMigrator.Extensions.Oracle" version="3.2.8" targetFramework="net461" />
diff --git a/src/Database/Models/KpiModel.cs b/src/Database/Models/KpiModel.cs
index 313e6dd6fbc80a58957568a1a3065b8e9f90add8..001a63776ccae37d9d3412305f225348d1074fe0 100644
--- a/src/Database/Models/KpiModel.cs
+++ b/src/Database/Models/KpiModel.cs
@@ -1,4 +1,5 @@
 using Coscine.Database.DataModel;
+using Coscine.Database.Util;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -23,5 +24,11 @@ namespace Coscine.Database.Models
         {
             databaseObject.Id = id;
         }
+
+        public int MarkAsSent(Kpi databaseObject)
+        {
+            databaseObject.SentSuccessfully = true;
+            return Update(databaseObject);
+        }
     }
 }
diff --git a/src/Database/Properties/AssemblyInfo.cs b/src/Database/Properties/AssemblyInfo.cs
index 0f714cc9849db4685093c91d3387f7f4ad9d67f7..1fee1e1834d363217eeef7c3f3091dca43e4c979 100644
--- a/src/Database/Properties/AssemblyInfo.cs
+++ b/src/Database/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
 [assembly: AssemblyProduct("Database")]
 [assembly: AssemblyVersion("1.25.0")]
 [assembly: AssemblyFileVersion("1.25.0")]
-[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0001")]
+[assembly: AssemblyInformationalVersion("1.25.0-topic-1051-basic0002")]
 [assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
 
diff --git a/src/Database/ReturnObjects/KpiObject.cs b/src/Database/ReturnObjects/KpiObject.cs
index 9044629c41b226e9ce7c4d7bb2e39b5d2540bbe0..9784d74634351770f7afd8c2a26ede6afeabbb1b 100644
--- a/src/Database/ReturnObjects/KpiObject.cs
+++ b/src/Database/ReturnObjects/KpiObject.cs
@@ -10,19 +10,33 @@ namespace Coscine.Database.ReturnObjects
     class KpiObject
     {
         public Guid Id { get; set; }
-        public string Label { get; set; }
+        public string MeasurementID { get; set; }
         public string Ikz { get; set; }
-        public int Count { get; set; }
-        public DateTime LastUpdate { get; set; }
-        public bool SentSuccessfully { get; set; }
+        public double? Value { get; set; }
+        public DateTime? Start { get; set; }
+        public DateTime? End { get; set; }
+        public string AdditionalInfo { get; set; }
+        public string AdditionalInfo1 { get; set; }
+        public string AdditionalInfo2 { get; set; }
+        public string AdditionalInfo3 { get; set; }
+        public string AdditionalInfo4 { get; set; } 
+        public string AdditionalInfo5 { get; set; }
+        public bool SentSuccessfully { get; set; } 
 
-        public KpiObject(Guid id, string label, DateTime lastUpdate, string ikz = null, int count = 0, bool sentSuccessfully = false)
+        public KpiObject(Guid id, string measurementId, string ikz, double value, DateTime start, DateTime end, string additionalInfo = "", string additionalInfo1 = "", string additionalInfo2 = "", string additionalInfo3 = "", string additionalInfo4 = "", string additionalInfo5 = "", bool sentSuccessfully = false)
         {
             Id = id;
-            Label = label;
-            Ikz = ikz != null ? ikz : "external";
-            Count = count;
-            LastUpdate = lastUpdate;
+            MeasurementID = measurementId;
+            Ikz = ikz;
+            Value = value;
+            Start = start;
+            End = end;
+            AdditionalInfo = additionalInfo;
+            AdditionalInfo1 = additionalInfo1;
+            AdditionalInfo2 = additionalInfo2;
+            AdditionalInfo3 = additionalInfo3;
+            AdditionalInfo4 = additionalInfo4;
+            AdditionalInfo5 = additionalInfo5;
             SentSuccessfully = sentSuccessfully;
         }
     }