diff --git a/lib/Controller/NoteApiController.php b/lib/Controller/NoteApiController.php
index c4bcd4f..e4badb3 100644
--- a/lib/Controller/NoteApiController.php
+++ b/lib/Controller/NoteApiController.php
@@ -116,13 +116,14 @@ class NoteApiController extends ApiController {
 	 * @param int $id
 	 * @param string $title
 	 * @param string $content
-	 * @param array $attachts
-	 * @param bool $pinned
+	 * @param array $attachments
+	 * @param bool $isPinned
 	 * @param array $tags
+	 * @param array $sharedWith
 	 * @param string $color
 	 */
-	public function update(int $id, string $title, string $content, array $attachts, bool $pinned, array $tags, string $color = "#F7EB96"): JSONResponse {
-		$note = $this->noteService->update($this->userId, $id, $title, $content, $attachts, $pinned, $tags, $color);
+	public function update(int $id, string $title, string $content, array $attachments, bool $isPinned, array $tags, array $sharedWith, string $color): JSONResponse {
+		$note = $this->noteService->update($this->userId, $id, $title, $content, $attachments, $isPinned, $tags, $sharedWith, $color);
 		if (is_null($note)) {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);
 		}
diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php
index 3581ecf..00dc8ab 100644
--- a/lib/Controller/NoteController.php
+++ b/lib/Controller/NoteController.php
@@ -108,14 +108,14 @@ class NoteController extends Controller {
 	 * @param int $id
 	 * @param string $title
 	 * @param string $content
-	 * @param array $attachts
-	 * @param bool $pinned
+	 * @param array $attachments
+	 * @param bool $isPinned
 	 * @param array $tags
-	 * @param array $shared_with
+	 * @param array $sharedWith
 	 * @param string $color
 	 */
-	public function update(int $id, string $title, string $content, array $attachts, bool $pinned, array $tags, array $shared_with, string $color = "#F7EB96"): JSONResponse {
-		$note = $this->noteService->update($this->userId, $id, $title, $content, $attachts, $pinned, $tags, $shared_with, $color);
+	public function update(int $id, string $title, string $content, array $attachments = [], bool $isPinned, array $tags = [], array $sharedWith = [], string $color): JSONResponse {
+		$note = $this->noteService->update($this->userId, $id, $title, $content, $attachments, $isPinned, $tags, $sharedWith, $color);
 		if (is_null($note)) {
 			return new JSONResponse([], Http::STATUS_NOT_FOUND);
 		}
diff --git a/lib/Db/Note.php b/lib/Db/Note.php
index 15007da..c7e03a4 100644
--- a/lib/Db/Note.php
+++ b/lib/Db/Note.php
@@ -15,7 +15,6 @@ class Note extends Entity implements JsonSerializable {
 	protected $userId;
 	protected $sharedWith = [];
 	protected $sharedBy = [];
-	protected $isShared;
 	protected $tags;
 	protected $attachts;
 
@@ -32,20 +31,17 @@ class Note extends Entity implements JsonSerializable {
 
 	public function jsonSerialize() {
 		return [
-			'id' => $this->id,
-			'title' => $this->title,
-			'content' => $this->content,
-			'pinned' => $this->pinned,
-			'ispinned' => $this->isPinned,
-			'timestamp' => $this->timestamp,
-			'colorid' => $this->colorId,
-			'color' => $this->color,
-			'userid' => $this->userId,
-			'shared_with' => $this->sharedWith,
-			'shared_by' => $this->sharedBy,
-			'is_shared' => $this->isShared,
-			'tags' => $this->tags,
-			'attachts' => $this->attachts
+			'id'          => $this->id,
+			'title'       => $this->title,
+			'content'     => $this->content,
+			'pinned'      => $this->pinned,
+			'isPinned'    => $this->isPinned,
+			'timestamp'   => $this->timestamp,
+			'color'       => $this->color,
+			'sharedWith'  => $this->sharedWith,
+			'sharedBy'    => $this->sharedBy,
+			'tags'        => $this->tags,
+			'attachments' => $this->attachts
 		];
 	}
 }
diff --git a/lib/Service/NoteService.php b/lib/Service/NoteService.php
index bd8c08c..ed13bbe 100644
--- a/lib/Service/NoteService.php
+++ b/lib/Service/NoteService.php
@@ -81,7 +81,6 @@ class NoteService {
 
 		// Set shares with others.
 		foreach($notes as $note) {
-			$note->setIsShared(false);
 			$note->setSharedWith($this->noteShareMapper->getSharesForNote($note->getId()));
 		}
 
@@ -90,8 +89,6 @@ class NoteService {
 		$sharedEntries = $this->noteShareMapper->findForUser($userId);
 		foreach($sharedEntries as $sharedEntry) {
 			$sharedNote = $this->notemapper->findShared($sharedEntry->getNoteId());
-			$sharedNote->setIsShared(true);
-
 			$sharedEntry->setUserId($sharedNote->getUserId());
 			$sharedNote->setSharedBy([$sharedEntry]);
 			$shares[] = $sharedNote;
@@ -343,7 +340,6 @@ class NoteService {
 		$newnote->setAttachts($attachts);
 
 		// Fill shared with with others
-		$newnote->setIsShared(false);
 		$newnote->setSharedWith($this->noteShareMapper->getSharesForNote($newnote->getId()));
 
 		//  Remove old color if necessary