diff -r 1ca4f27cefe8 -r b7f3e972b13c src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt
--- a/src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt	Sat Nov 27 12:12:20 2021 +0100
+++ b/src/main/kotlin/de/uapcore/lightpit/entities/IssueHistoryEntry.kt	Sat Nov 27 13:03:57 2021 +0100
@@ -31,12 +31,15 @@
 import java.sql.Date
 import java.sql.Timestamp
 
-class IssueHistoryData(
-    val id: Int,
+class IssueHistoryEntry(
+    val subject: String,
+    val time: Timestamp,
+    val type: IssueHistoryType,
+    val currentAssignee: String?,
+    val issueid: Int,
     val component: String,
     val status: IssueStatus,
     val category: IssueCategory,
-    val subject: String,
     val description: String,
     val assignee: String,
     val eta: Date?,
@@ -44,21 +47,12 @@
     val resolved: String,
 )
 
-class IssueCommentHistoryData(
-    val commentid: Int,
-    val comment: String
-)
-
-class IssueHistoryEntry(
+class IssueCommentHistoryEntry(
+    val subject: String,
     val time: Timestamp,
     val type: IssueHistoryType,
     val currentAssignee: String?,
-    val data: IssueHistoryData
-)
-
-class IssueCommentHistoryEntry(
-    val time: Timestamp,
-    val type: IssueHistoryType,
-    val currentAssignee: String?,
-    val data: IssueCommentHistoryData
+    val issueid: Int,
+    val commentid: Int,
+    val comment: String,
 )
\ No newline at end of file