diff --git a/MyCore/DTO/MyControlPanel/DeviceDTO.cs b/MyCore/DTO/MyControlPanel/DeviceDTO.cs
index b4b7718..978cd3d 100644
--- a/MyCore/DTO/MyControlPanel/DeviceDTO.cs
+++ b/MyCore/DTO/MyControlPanel/DeviceDTO.cs
@@ -23,6 +23,8 @@ namespace MyCore.DTO.MyControlPanel
 
         public LocationDTO Location { get; set; }
 
+        public DateTime LastStateDate { get; set; }
+
         public bool Battery { get; set; }
 
         public int BatteryStatus { get; set; }
@@ -54,9 +56,9 @@ namespace MyCore.DTO.MyControlPanel
 
         public DateTime UpdatedDate { get; set; }
 
-        public string LastMessage { get; set; } // TODO UNIFORMISATION ? 
+        public string LastState { get; set; } // TODO UNIFORMISATION ? 
 
-        public DateTime LastMessageDate { get; set; }
+        public DateTime LastStateDate { get; set; }
 
         public string IpAddress { get; set; }
 
diff --git a/MyCore/Models/MyControlPanel/Database/Device.cs b/MyCore/Models/MyControlPanel/Database/Device.cs
index e09bcf9..e8a3882 100644
--- a/MyCore/Models/MyControlPanel/Database/Device.cs
+++ b/MyCore/Models/MyControlPanel/Database/Device.cs
@@ -53,11 +53,11 @@ namespace MyCore.Models.MyControlPanel.Database
         [BsonElement("UpdatedDate")]
         public DateTime UpdatedDate { get; set; }
 
-        [BsonElement("LastMessage")]
-        public string LastMessage { get; set; } // TODO UNIFORMISATION ? 
+        [BsonElement("LastState")]
+        public string LastState { get; set; } // TODO UNIFORMISATION ? 
 
-        [BsonElement("LastMessageDate")]
-        public DateTime LastMessageDate { get; set; }
+        [BsonElement("LastStateDate")]
+        public DateTime LastStateDate { get; set; }
 
         [BsonElement("IpAddress")]
         public string IpAddress { get; set; }
@@ -95,6 +95,7 @@ namespace MyCore.Models.MyControlPanel.Database
                 ConnectionStatus = ConnectionStatus,
                 LocationId = LocationId, // Check if correct way
                 // Location = 
+                LastStateDate = LastStateDate,
                 Battery = Battery,
                 BatteryStatus = BatteryStatus
             };
@@ -116,8 +117,8 @@ namespace MyCore.Models.MyControlPanel.Database
                 MeansOfCommunications = MeansOfCommunications,
                 CreatedDate = CreatedDate,
                 UpdatedDate = UpdatedDate,
-                LastMessage = LastMessage,
-                LastMessageDate = LastMessageDate,
+                LastState = LastState,
+                LastStateDate = LastStateDate,
                 IpAddress = IpAddress,
                 ServiceIdentification = ServiceIdentification,
                 ProviderId = ProviderId,