diff --git a/.env b/.env
index e015247..10a6e2c 100644
--- a/.env
+++ b/.env
@@ -3,4 +3,4 @@ API_URL='https://pinmenote.com'
 SHORT_URL='https://pmn.cl'
 WEBSITE_URL='https://pinmenote.com'
 IS_PRODUCTION=true
-OBJ_LIST_LIMIT=10000
\ No newline at end of file
+OBJ_LIST_LIMIT=1000
\ No newline at end of file
diff --git a/.env.development b/.env.development
index 5ed11ef..42c1a94 100644
--- a/.env.development
+++ b/.env.development
@@ -3,4 +3,4 @@ API_URL='http://localhost:3000'
 SHORT_URL='http://localhost:8001'
 WEBSITE_URL='http://localhost:4200'
 IS_PRODUCTION=false
-OBJ_LIST_LIMIT=10
\ No newline at end of file
+OBJ_LIST_LIMIT=20
\ No newline at end of file
diff --git a/src/common/model/obj-bookmark.model.ts b/src/common/model/obj-bookmark.model.ts
new file mode 100644
index 0000000..8b34211
--- /dev/null
+++ b/src/common/model/obj-bookmark.model.ts
@@ -0,0 +1,20 @@
+/*
+ * This file is part of the pinmenote-extension distribution (https://github.com/pinmenote/pinmenote-extension).
+ * Copyright (c) 2023 Michal Szczepanski.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+export interface ObjBookmarkDto {
+  value: string;
+  screenshot?: string;
+}
diff --git a/src/common/model/obj-note.model.ts b/src/common/model/obj-note.model.ts
index 7ca5dc4..bd192c4 100644
--- a/src/common/model/obj-note.model.ts
+++ b/src/common/model/obj-note.model.ts
@@ -1,3 +1,19 @@
-export interface ObjNoteDataDto {
+/*
+ * This file is part of the pinmenote-extension distribution (https://github.com/pinmenote/pinmenote-extension).
+ * Copyright (c) 2023 Michal Szczepanski.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+export interface ObjNoteDto {
   value: string;
 }
diff --git a/src/common/model/obj-pin.model.ts b/src/common/model/obj-pin.model.ts
index 20ae65d..338c939 100644
--- a/src/common/model/obj-pin.model.ts
+++ b/src/common/model/obj-pin.model.ts
@@ -1,17 +1,48 @@
-import { HtmlContent } from './html.model';
-
-interface ObjPagePin {
+/*
+ * This file is part of the pinmenote-extension distribution (https://github.com/pinmenote/pinmenote-extension).
+ * Copyright (c) 2023 Michal Szczepanski.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface ObjPagePinDto {
   title: string;
-  pinList: PinData[];
+  theme: string;
+  html: PinHtmlDataDto[];
+  css: PinCssDataDto;
+  video: PinVideoDataDto[];
 }
 
-interface PinData {
+interface PinVideoDataDto {
+  currentTime: number;
+  displayTime: number;
+  xpath: string;
+}
+
+interface PinHtmlDataDto {
+  parent: string; // bodyStyle
   screenshot?: string;
-  content: HtmlContent;
-  border: PinBorderData;
+  html: string;
+  text: string; // innerText value of html
+  xpath: string;
+  border: PinBorderDataDto;
 }
 
-interface PinBorderData {
+export interface PinCssDataDto {
+  css: string;
+  href: string[];
+}
+
+interface PinBorderDataDto {
   radius: string;
   style: string;
 }
diff --git a/src/common/model/obj.model.ts b/src/common/model/obj.model.ts
index 3f99cbe..3667096 100644
--- a/src/common/model/obj.model.ts
+++ b/src/common/model/obj.model.ts
@@ -1,3 +1,19 @@
+/*
+ * This file is part of the pinmenote-extension distribution (https://github.com/pinmenote/pinmenote-extension).
+ * Copyright (c) 2023 Michal Szczepanski.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
 export enum ObjViewTypeDto {
   Screenshot = 'SCREENSHOT',
   Html = 'HTML'