diff --git a/appinfo/database.xml b/appinfo/database.xml
index 99b4165..e9f1c29 100644
--- a/appinfo/database.xml
+++ b/appinfo/database.xml
@@ -68,6 +68,69 @@
 			</field>
 		</declaration>
 	</table>
+	<table>
+		<name>*dbprefix*quicknotes_tags</name>
+		<declaration>
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<autoincrement>true</autoincrement>
+				<unsigned>true</unsigned>
+				<primary>true</primary>
+				<length>8</length>
+			</field>
+			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<length>200</length>
+				<default></default>
+				<notnull>true</notnull>
+			</field>
+			<field>
+				<name>name</name>
+				<type>text</type>
+				<length>200</length>
+				<default></default>
+				<notnull>true</notnull>
+			</field>
+		</declaration>
+	</table>
+	<table>
+		<name>*dbprefix*quicknotes_note_tags</name>
+		<declaration>
+			<field>
+				<name>id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<autoincrement>true</autoincrement>
+				<unsigned>true</unsigned>
+				<primary>true</primary>
+				<length>8</length>
+			</field>
+			<field>
+				<name>user_id</name>
+				<type>text</type>
+				<length>200</length>
+				<default></default>
+				<notnull>true</notnull>
+			</field>
+			<field>
+				<name>note_id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>8</length>
+			</field>
+			<field>
+				<name>tag_id</name>
+				<type>integer</type>
+				<notnull>true</notnull>
+				<unsigned>true</unsigned>
+				<length>8</length>
+			</field>
+		</declaration>
+	</table>
 	<table>
 		<name>*dbprefix*quicknotes_tasks</name>
 		<declaration>
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 6dcfbe7..1870be7 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -5,7 +5,7 @@
     <name>Quick notes</name>
     <summary>Quick notes with a basic rich text</summary>
     <description>Quick notes with a basic rich text</description>
-    <version>0.1.10</version>
+    <version>0.1.11</version>
     <licence>agpl</licence>
     <author>Matias De lellis</author>
     <namespace>QuickNotes</namespace>
diff --git a/db/notetag.php b/db/notetag.php
new file mode 100644
index 0000000..dd9374d
--- /dev/null
+++ b/db/notetag.php
@@ -0,0 +1,23 @@
+<?php
+namespace OCA\QuickNotes\Db;
+
+use JsonSerializable;
+
+use OCP\AppFramework\Db\Entity;
+
+class NoteTag extends Entity implements JsonSerializable {
+
+	protected $noteId;
+	protected $tagId
+	protected $userId;
+
+	public function jsonSerialize() {
+		return [
+			'id' => $this->id,
+			'noteid' => $this->noteId,
+			'tagid' => $this->tagId,
+			'userid' => $this->userId
+		];
+	}
+
+}
\ No newline at end of file
diff --git a/db/notetagmapper.php b/db/notetagmapper.php
new file mode 100644
index 0000000..d540eff
--- /dev/null
+++ b/db/notetagmapper.php
@@ -0,0 +1,23 @@
+<?php
+namespace OCA\QuickNotes\Db;
+
+use OCP\IDBConnection;
+use OCP\AppFramework\Db\Mapper;
+
+class NoteTagMapper extends Mapper {
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'quicknotes_note_tags', '\OCA\QuickNotes\Db\Tag');
+	}
+
+	public function find($id, $userId) {
+		$sql = 'SELECT * FROM *PREFIX*quicknotes_note_tags WHERE id = ? AND user_id = ?';
+		return $this->findEntity($sql, [$id, $userId]);
+	}
+
+	public function findAll($userId) {
+		$sql = 'SELECT * FROM *PREFIX*quicknotes_note_tags WHERE user_id = ?';
+		return $this->findEntities($sql, [$userId]);
+	}
+
+}
\ No newline at end of file
diff --git a/db/tag.php b/db/tag.php
new file mode 100644
index 0000000..b6a618a
--- /dev/null
+++ b/db/tag.php
@@ -0,0 +1,21 @@
+<?php
+namespace OCA\QuickNotes\Db;
+
+use JsonSerializable;
+
+use OCP\AppFramework\Db\Entity;
+
+class Tag extends Entity implements JsonSerializable {
+
+	protected $name;
+	protected $userId;
+
+	public function jsonSerialize() {
+		return [
+			'id' => $this->id,
+			'name' => $this->name,
+			'userid' => $this->userId
+		];
+	}
+
+}
\ No newline at end of file
diff --git a/db/tagmapper.php b/db/tagmapper.php
new file mode 100644
index 0000000..6bb4161
--- /dev/null
+++ b/db/tagmapper.php
@@ -0,0 +1,23 @@
+<?php
+namespace OCA\QuickNotes\Db;
+
+use OCP\IDBConnection;
+use OCP\AppFramework\Db\Mapper;
+
+class TagMapper extends Mapper {
+
+	public function __construct(IDBConnection $db) {
+		parent::__construct($db, 'quicknotes_tags', '\OCA\QuickNotes\Db\Tag');
+	}
+
+	public function find($id, $userId) {
+		$sql = 'SELECT * FROM *PREFIX*quicknotes_tags WHERE id = ? AND user_id = ?';
+		return $this->findEntity($sql, [$id, $userId]);
+	}
+
+	public function findAll($userId) {
+		$sql = 'SELECT * FROM *PREFIX*quicknotes_tags WHERE user_id = ?';
+		return $this->findEntities($sql, [$userId]);
+	}
+
+}
\ No newline at end of file