diff --git a/lib/Db/FsEvent.php b/lib/Db/FsEvent.php
index ff2bad2..dcf6268 100644
--- a/lib/Db/FsEvent.php
+++ b/lib/Db/FsEvent.php
@@ -23,7 +23,6 @@
  * @method setNodeId(int $nodeId)
  */
 class FsEvent extends Entity {
-	public $id;
 	protected $type;
 	protected $userId;
 	protected $nodeId;
diff --git a/lib/Db/QueueAction.php b/lib/Db/QueueAction.php
index 6bf4db7..44669fc 100644
--- a/lib/Db/QueueAction.php
+++ b/lib/Db/QueueAction.php
@@ -21,7 +21,6 @@
  * @method setPayload(string $payload)
  */
 class QueueAction extends Entity {
-	public $id;
 	protected $type;
 	protected $payload;
 
@@ -32,7 +31,6 @@ class QueueAction extends Entity {
 
 	public function __construct() {
 		// add types in constructor
-		$this->addType('id', 'integer');
 		$this->addType('type', 'string');
 		$this->addType('payload', 'string');
 	}
diff --git a/lib/Db/QueueContentItem.php b/lib/Db/QueueContentItem.php
index 100e133..6a5ff08 100644
--- a/lib/Db/QueueContentItem.php
+++ b/lib/Db/QueueContentItem.php
@@ -34,7 +34,6 @@
  * @method string getUsers()
  */
 class QueueContentItem extends Entity {
-	public $id;
 	protected $itemId;
 	protected $appId;
 	protected $providerId;
@@ -69,7 +68,6 @@ class QueueContentItem extends Entity {
 
 	public function __construct() {
 		// add types in constructor
-		$this->addType('id', Types::INTEGER);
 		$this->addType('itemId', Types::STRING);
 		$this->addType('appId', Types::STRING);
 		$this->addType('providerId', Types::STRING);
diff --git a/lib/Db/QueueFile.php b/lib/Db/QueueFile.php
index 7d27e41..6a23866 100644
--- a/lib/Db/QueueFile.php
+++ b/lib/Db/QueueFile.php
@@ -26,7 +26,6 @@
  * @method bool getUpdate()
  */
 class QueueFile extends Entity {
-	public $id;
 	protected $fileId;
 	protected $storageId;
 	protected $rootId;
@@ -39,7 +38,6 @@ class QueueFile extends Entity {
 
 	public function __construct() {
 		// add types in constructor
-		$this->addType('id', 'integer');
 		$this->addType('fileId', 'integer');
 		$this->addType('storageId', 'integer');
 		$this->addType('rootId', 'integer');
diff --git a/lib/Service/DiagnosticService.php b/lib/Service/DiagnosticService.php
index ab85469..ee23261 100644
--- a/lib/Service/DiagnosticService.php
+++ b/lib/Service/DiagnosticService.php
@@ -21,37 +21,37 @@ public function __construct(
 
 	/**
 	 * @param string $class
-	 * @param int $id
+	 * @param int|string $id
 	 * @return void
 	 */
-	public function sendJobTrigger(string $class, int $id): void {
+	public function sendJobTrigger(string $class, int|string $id): void {
 		$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' triggered');
 	}
 
 	/**
 	 * @param string $class
-	 * @param int $id
+	 * @param int|string $id
 	 * @return void
 	 */
-	public function sendJobStart(string $class, int $id): void {
+	public function sendJobStart(string $class, int|string $id): void {
 		$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' started');
 	}
 
 	/**
 	 * @param string $class
-	 * @param int $id
+	 * @param int|string $id
 	 * @return void
 	 */
-	public function sendJobEnd(string $class, int $id): void {
+	public function sendJobEnd(string $class, int|string $id): void {
 		$this->logger->info('Background jobs: ' . $class . ' ' . $id . ' ended');
 	}
 
 	/**
 	 * @param string $class
-	 * @param int $id
+	 * @param int|string $id
 	 * @return void
 	 */
-	public function sendHeartbeat(string $class, int $id): void {
+	public function sendHeartbeat(string $class, int|string $id): void {
 	}
 
 	/**