diff --git a/lib/Db/Color.php b/lib/Db/Color.php
index 0fb90b7..07d21f1 100644
--- a/lib/Db/Color.php
+++ b/lib/Db/Color.php
@@ -5,6 +5,10 @@ use JsonSerializable;
 
 use OCP\AppFramework\Db\Entity;
 
+/**
+ * @method void setColor(string $color)
+ * @method strinf getColor()
+ */
 class Color extends Entity implements JsonSerializable {
 
 	protected $color;
diff --git a/lib/Db/ColorMapper.php b/lib/Db/ColorMapper.php
index 02bce67..0dc1e39 100644
--- a/lib/Db/ColorMapper.php
+++ b/lib/Db/ColorMapper.php
@@ -2,36 +2,42 @@
 namespace OCA\QuickNotes\Db;
 
 use OCP\IDBConnection;
-use OCP\AppFramework\Db\Mapper;
+use OCP\AppFramework\Db\QBMapper;
 use OCP\AppFramework\Db\DoesNotExistException;
 
+use OCP\DB\QueryBuilder\IQueryBuilder;
+
 use OCA\QuickNotes\Db\Color;
 
-class ColorMapper extends Mapper {
+class ColorMapper extends QBMapper {
 
 	public function __construct(IDBConnection $db) {
-		parent::__construct($db, 'quicknotes_colors', '\OCA\QuickNotes\Db\Color');
+		parent::__construct($db, 'quicknotes_colors', Color::class);
 	}
 
-	public function find($id): Color {
-		$sql = 'SELECT * FROM *PREFIX*quicknotes_colors WHERE id = ?';
-		return $this->findEntity($sql, [$id]);
-	}
-
-	public function findAll(): array {
-		$sql = 'SELECT * FROM *PREFIX*quicknotes_colors';
-		return $this->findEntities($sql, []);
+	public function find(int $id): Color {
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->tableName)
+			->where(
+				$qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT))
+			);
+		return $this->findEntity($qb);
 	}
 
 	public function findByColor(string $color): Color {
-		$sql = 'SELECT * FROM *PREFIX*quicknotes_colors WHERE color = ?';
-		return $this->findEntity($sql, [$color]);
+		$qb = $this->db->getQueryBuilder();
+		$qb->select('*')
+			->from($this->tableName)
+			->where(
+				$qb->expr()->eq('color', $qb->createNamedParameter($color, IQueryBuilder::PARAM_STRING))
+			);
+		return $this->findEntity($qb);
 	}
 
 	public function colorExists(string $color): bool {
-		$sql = 'SELECT * FROM *PREFIX*quicknotes_colors WHERE color = ?';
 		try {
-			$this->findEntity($sql, [$color]);
+			$this->findByColor($color);
 		} catch (DoesNotExistException $e) {
 			return false;
 		}
diff --git a/lib/Db/NoteShare.php b/lib/Db/NoteShare.php
index 8d1a700..6a44d3d 100644
--- a/lib/Db/NoteShare.php
+++ b/lib/Db/NoteShare.php
@@ -19,12 +19,19 @@ class NoteShare extends Entity implements JsonSerializable {
 	protected $sharedUser;
 	protected $sharedGroup;
 
+	protected $userId;
+
+	public function setUserId (string $userId): void {
+		$this->userId = $userId;
+	}
+
 	public function jsonSerialize() {
 		return [
 			'id' => $this->id,
 			'note_id' => $this->noteId,
 			'shared_user' => $this->sharedUser,
-			'shared_group' => $this->sharedGroup
+			'shared_group' => $this->sharedGroup,
+			'user_id' => $this->userId
 		];
 	}