diff --git a/swagger.yaml b/swagger.yaml
index a318855..1e3eeb0 100644
--- a/swagger.yaml
+++ b/swagger.yaml
@@ -28,29 +28,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data: 
                     type: array
                     items:
                       $ref: '#/components/schemas/project_GET'
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "project_id": "F445F4F2-4D02-4B2A-B612-5E456BEF9137",
                     "name": "Example project 1",
@@ -242,29 +236,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref: '#/components/schemas/topic_GET'
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "guid": "A245F4F2-2C01-B43B-B612-5E456BEF8116",
                     "server_assigned_id": "ISSUE-00001",
@@ -450,29 +438,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/project_files_information_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "display_information": [{
                       "field_display_name": "Model Name",
@@ -523,29 +505,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/file_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "ifc_project": "0J$yPqHBD12v72y4qF6XcD",
                     "file_name": "OfficeBuilding_Architecture_0001.ifc",
@@ -642,29 +618,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/comment_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "guid": "C4215F4D-AC45-A43A-D615-AA456BEF832B",
                     "date": "2016-08-01T12:34:22.409Z",
@@ -803,29 +773,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/viewpoint_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "guid": "b24a82e9-f67b-43b8-bda0-4946abf39624",
                     "perspective_camera": {
@@ -1399,29 +1363,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/related_topic_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "related_topic_guid": "db49df2b-0e42-473b-a3ee-f7b785d783c4"
                   }, {
@@ -1491,29 +1449,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/document_reference_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "guid": "212ab37a-6122-448e-86fc-86503183b520",
                     "url": "http://example.com/files/LegalRequirements.pdf",
@@ -1619,29 +1571,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/document_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "guid": "472ab37a-6122-448e-86fc-86503183b520",
                     "filename": "LegalRequirements.pdf"
@@ -1741,29 +1687,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/topic_event_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "topic_guid": "A211FCC2-3A3B-EAA4-C321-DE22ABC8414",
                     "date": "2014-11-19T14:24:11.316Z",
@@ -1832,29 +1772,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/topic_event_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "topic_guid": "A245F4F2-2C01-B43B-B612-5E456BEF8116",
                     "date": "2014-11-19T14:24:11.316Z",
@@ -1924,29 +1858,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/comment_event_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "comment_guid": "C4215F4D-AC45-A43A-D615-AA456BEF832B",
                     "topic_guid": "A211FCC2-3A3B-EAA4-C321-DE22ABC8414",
@@ -2018,29 +1946,23 @@ paths:
               schema:
                 type: object
                 required:
-                  - skip
-                  - top
-                  - totalCount
+                  - pagination
                   - data
                 properties:
-                  skip:
-                    type: integer
-                  top:
-                    type: integer
-                  totalCount:
-                    type: integer
-                  nextLink:
-                    type: string
+                  pagination:
+                    $ref: '#/components/schemas/pagination'
                   data:
                     type: array
                     items:
                       $ref:  "#/components/schemas/comment_event_GET"
               example:
                 {
-                  "skip": 0,
-                  "top": 1000,
-                  "totalCount": 2,
-                  "nextLink": null,
+                  "pagination": {
+                    "skip": 0,
+                    "top": 1000,
+                    "totalCount": 2,
+                    "nextLink": null
+                  },
                   "data": [{
                     "comment_guid": "C4215F4D-AC45-A43A-D615-AA456BEF832B",
                     "topic_guid": "A211FCC2-3A3B-EAA4-C321-DE22ABC8414",
@@ -2067,6 +1989,22 @@ paths:
                 }
 components:
   schemas:
+    pagination:
+      type: object
+      required:
+        - skip
+        - top
+        - totalCount
+        - data
+      properties:
+        skip:
+          type: integer
+        top:
+          type: integer
+        totalCount:
+          type: integer
+        nextLink:
+          type: string
     # error
     error:
       type: object