diff --git a/_data/taps/schemas/toggl/v1/json/clients.json b/_data/taps/schemas/toggl/v1/json/clients.json
index b6001485c..5e87e022c 100644
--- a/_data/taps/schemas/toggl/v1/json/clients.json
+++ b/_data/taps/schemas/toggl/v1/json/clients.json
@@ -1,50 +1,87 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
-    "at": {
+    "id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "wid": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "archived": {
       "type": [
         "null",
-        "date-time"
+        "boolean"
       ]
     },
-    "cur": {
+    "name": {
       "type": [
         "null",
         "string"
       ]
     },
-    "hrate": {
+    "at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "notes": {
       "type": [
         "null",
-        "integer"
+        "string"
       ]
     },
-    "id": {
+    "creator_id": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "name": {
+    "external_reference": {
       "type": [
         "null",
         "string"
       ]
     },
-    "notes": {
+    "integration_ext_id": {
       "type": [
         "null",
         "string"
       ]
     },
-    "wid": {
+    "integration_ext_type": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "integration_provider": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "permissions": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "total_count": {
       "type": [
         "null",
         "integer"
       ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/groups.json b/_data/taps/schemas/toggl/v1/json/groups.json
index 93839eaff..2fc453bce 100644
--- a/_data/taps/schemas/toggl/v1/json/groups.json
+++ b/_data/taps/schemas/toggl/v1/json/groups.json
@@ -1,32 +1,172 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
-    "at": {
+    "group_id": {
       "type": [
         "null",
-        "date-time"
+        "integer"
       ]
     },
-    "id": {
+    "name": {
       "type": [
         "null",
-        "integer"
+        "string"
       ]
     },
-    "name": {
+    "at": {
       "type": [
         "null",
         "string"
-      ]
+      ],
+      "format": "date-time"
     },
-    "wid": {
+    "workspaces": {
       "type": [
         "null",
-        "integer"
-      ]
+        "array"
+      ],
+    "items": {
+        "type": [
+          "null",
+          "integer"
+        ]
+      }
+    },
+    "permissions": {
+        "type": [
+        "null",
+        "string"
+        ]
+    },
+    "users": {
+      "type": [
+        "null",
+        "array"
+      ],
+      "items": {
+        "type": [
+          "null",
+          "object"
+        ],
+        "properties": {
+          "user_id": {
+            "type": [
+              "null",
+              "integer"
+            ]
+          },
+          "name": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "avatar_url": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "inactive": {
+            "type": [
+              "null",
+              "boolean"
+            ]
+          },
+          "joined": {
+            "type": [
+              "null",
+              "boolean"
+            ]
+          },
+          "active": {
+            "type": [
+              "null",
+              "boolean"
+            ]
+          },
+          "created_at": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "deleted_at": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "email": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "id": {
+            "type": [
+              "null",
+              "integer"
+            ]
+          },
+          "invited_at": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "organization_user_id": {
+            "type": [
+              "null",
+              "integer"
+            ]
+          },
+          "role_code": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "role_id": {
+            "type": [
+              "null",
+              "integer"
+            ]
+          },
+          "role_name": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "status": {
+            "type": [
+              "null",
+              "string"
+            ]
+          },
+          "suspended_at": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          },
+          "updated_at": {
+            "type": [
+              "null",
+              "string"
+            ],
+            "format": "date-time"
+          }
+        }
+      }
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/projects.json b/_data/taps/schemas/toggl/v1/json/projects.json
index 0a0cad6ac..b1d17673c 100644
--- a/_data/taps/schemas/toggl/v1/json/projects.json
+++ b/_data/taps/schemas/toggl/v1/json/projects.json
@@ -1,5 +1,45 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
+    "id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "workspace_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "cid": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "billable": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "is_private": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
     "active": {
       "type": [
         "null",
@@ -9,48 +49,223 @@
     "at": {
       "type": [
         "null",
-        "date-time"
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "actual_hours": {
+      "type": [
+        "null",
+        "integer"
       ]
     },
-    "billable": {
+    "actual_seconds": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "auto_estimates": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "cid": {
+    "can_track_time": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "client_id": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "id": {
+    "client_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "color": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "created_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "currency": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "estimated_hours": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "is_private": {
+    "estimated_seconds": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "fixed_fee": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "pinned": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "name": {
+    "rate": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "rate_last_updated": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "recurring": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "start_date": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "status": {
       "type": [
         "null",
         "string"
       ]
     },
+    "template": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "template_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
     "wid": {
       "type": [
         "null",
         "integer"
       ]
+    },
+    "gid": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "group_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "labor_cost": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "labor_cost_last_updated": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "manager": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "project_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "user_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "active_tasks": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "archieved": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "creator": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "deleted_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "project_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "updated_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "visibility": {
+      "type": [
+        "null",
+        "string"
+      ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/schema-fixture.json b/_data/taps/schemas/toggl/v1/json/schema-fixture.json
new file mode 100644
index 000000000..b3e2fcda2
--- /dev/null
+++ b/_data/taps/schemas/toggl/v1/json/schema-fixture.json
@@ -0,0 +1,125 @@
+{
+  "workspaces": {
+    "id": "integer",
+    "name": "string",
+    "premium": "boolean",
+    "admin": "boolean",
+    "default_hourly_rate": "integer",
+    "default_currency": "string",
+    "only_admins_may_create_projects": "boolean",
+    "only_admins_see_billable_rates": "boolean",
+    "rounding": "integer",
+    "rounding_minutes": "integer",
+    "at": "date-time",
+    "logo_url": "string"
+  },
+  "clients": {
+    "id": "integer",
+    "wid": "integer",
+    "name": "string",
+    "at": "date-time",
+    "notes": "string",
+    "hrate": "integer",
+    "cur": "string"
+  },
+  "groups": {
+    "id": "integer",
+    "wid": "integer",
+    "name": "string",
+    "at": "date-time"
+  },
+  "projects": {
+    "id": "integer",
+    "wid": "integer",
+    "cid": "integer",
+    "name": "string",
+    "billable": "boolean",
+    "is_private": "boolean",
+    "active": "boolean",
+    "at": "date-time"
+  },
+  "tasks": {
+    "name": "string",
+    "id": "integer",
+    "wid": "integer",
+    "pid": "integer",
+    "uid": "integer",
+    "active": "boolean",
+    "at": "date-time",
+    "estimated_seconds": "integer"
+  },
+  "tags": {
+    "id": "integer",
+    "wid": "integer",
+    "name": "string"
+  },
+  "users": {
+    "id": "integer",
+    "default_wid": "integer",
+    "email": "string",
+    "fullname": "string",
+    "jquery_timeofday_format": "string",
+    "jquery_date_format": "string",
+    "timeofday_format": "string",
+    "date_format": "string",
+    "store_start_and_stop_time": "boolean",
+    "beginning_of_week": "integer",
+    "language": "string",
+    "image_url": "string",
+    "sidebar_piechart": "boolean",
+    "at": "date-time",
+    "retention": "integer",
+    "record_timeline": "boolean",
+    "render_timeline": "boolean",
+    "timeline_enabled": "boolean",
+    "timeline_experiment": "boolean",
+    "new_blog_post": "string",
+    "should_upgrade": "boolean",
+    "invitation": "string"
+  },
+  "workspace_users": {
+    "id": "integer",
+    "uid": "integer",
+    "wid": "integer",
+    "admin": "boolean",
+    "active": "boolean",
+    "email": "string",
+    "at": "date-time",
+    "name": "string",
+    "invite_url": "string"
+  },
+  "time_entries": {
+    "total_grand": "integer",
+    "total_billable": "integer",
+    "total_count": "integer",
+    "per_page": "integer",
+    "total_currencies":[
+      {
+        "currency": "string",
+        "amount": "integer"
+      }
+    ],
+    "data":[
+      {
+        "id": "integer",
+        "pid": "integer",
+        "tid": "integer",
+        "uid": "integer",
+        "description": "string",
+        "start": "date-time",
+        "end": "date-time",
+        "updated": "date-time",
+        "dur": "integer",
+        "user": "string",
+        "use_stop": "boolean",
+        "client": "string",
+        "project": "string",
+        "task": "string",
+        "billable": "number",
+        "is_billable": "boolean",
+        "cur": "string",
+        "tags": ["string"]
+      }
+    ]
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/tags.json b/_data/taps/schemas/toggl/v1/json/tags.json
index 1f7786f9b..a6cb501e0 100644
--- a/_data/taps/schemas/toggl/v1/json/tags.json
+++ b/_data/taps/schemas/toggl/v1/json/tags.json
@@ -1,4 +1,8 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
     "id": {
       "type": [
@@ -6,21 +10,61 @@
         "integer"
       ]
     },
+    "workspace_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
     "name": {
       "type": [
         "null",
         "string"
       ]
     },
-    "wid": {
+    "at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "creator_id": {
       "type": [
         "null",
         "integer"
       ]
+    },
+    "deleted_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "integration_ext_id": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "integration_ext_type": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "integration_provider": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "permissions": {
+      "type": [
+        "null",
+        "string"
+      ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/tasks.json b/_data/taps/schemas/toggl/v1/json/tasks.json
index 4c368f9f2..fd8991f74 100644
--- a/_data/taps/schemas/toggl/v1/json/tasks.json
+++ b/_data/taps/schemas/toggl/v1/json/tasks.json
@@ -1,5 +1,45 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
+    "name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "workspace_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "project_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "user_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "recurring": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
     "active": {
       "type": [
         "null",
@@ -9,8 +49,16 @@
     "at": {
       "type": [
         "null",
-        "date-time"
-      ]
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "server_deleted_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
     },
     "estimated_seconds": {
       "type": [
@@ -18,39 +66,95 @@
         "integer"
       ]
     },
-    "id": {
+    "tracked_seconds": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "name": {
+    "toggl_accounts_id": {
       "type": [
         "null",
         "string"
       ]
     },
-    "pid": {
+    "user_name": {
       "type": [
         "null",
-        "integer"
+        "string"
       ]
     },
-    "uid": {
+    "avatar_url": {
       "type": [
         "null",
-        "integer"
+        "string"
       ]
     },
-    "wid": {
+    "client_name": {
       "type": [
         "null",
-        "integer"
+        "string"
+      ]
+    },
+    "integration_ext_id": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "integration_ext_type": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "integration_provider": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "permissions": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "project_billable": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "project_color": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "project_is_private": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "project_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "rate": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "rate_last_updated": {
+      "type": [
+        "null",
+        "string"
       ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/time_entries.json b/_data/taps/schemas/toggl/v1/json/time_entries.json
index e9d74aebe..00b48a68f 100644
--- a/_data/taps/schemas/toggl/v1/json/time_entries.json
+++ b/_data/taps/schemas/toggl/v1/json/time_entries.json
@@ -1,21 +1,25 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
-    "billable": {
+    "id": {
       "type": [
         "null",
-        "number"
+        "integer"
       ]
     },
-    "client": {
+    "pid": {
       "type": [
         "null",
-        "string"
+        "integer"
       ]
     },
-    "cur": {
+    "uid": {
       "type": [
         "null",
-        "string"
+        "integer"
       ]
     },
     "description": {
@@ -24,94 +28,168 @@
         "string"
       ]
     },
-    "dur": {
+    "start": {
       "type": [
         "null",
-        "integer"
-      ]
+        "string"
+      ],
+      "format": "date-time"
     },
-    "end": {
+    "at": {
       "type": [
         "null",
-        "date-time"
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "billable": {
+      "type": [
+        "null",
+        "boolean"
       ]
     },
-    "id": {
+    "duration": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "is_billable": {
+    "duronly": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "pid": {
+    "project_id": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "project": {
+    "stop": {
       "type": [
         "null",
         "string"
-      ]
+      ],
+      "format": "date-time"
     },
-    "start": {
+    "tag_ids": {
       "type": [
         "null",
-        "date-time"
-      ]
+        "array"
+      ],
+      "items": {
+        "type": [
+          "integer"
+        ]
+      }
     },
     "tags": {
-      "items": {},
       "type": [
         "null",
         "array"
+      ],
+      "items": {
+        "type": [
+          "string"
+        ]
+      }
+    },
+    "task_id": {
+      "type": [
+        "null",
+        "integer"
       ]
     },
-    "task": {
+    "user_id": {
       "type": [
         "null",
-        "string"
+        "integer"
       ]
     },
-    "tid": {
+    "wid": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "uid": {
+    "workspace_id": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "updated": {
+    "client_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "expense_ids": {
+      "type": [
+        "null",
+        "array"
+      ]
+    },
+    "permissions": {
       "type": [
         "null",
-        "date-time"
+        "array"
       ]
     },
-    "use_stop": {
+    "project_active": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "user": {
+    "project_billable": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "project_color": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "project_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "shared_with": {
+      "type": [
+        "null",
+        "array"
+      ]
+    },
+    "task_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "tid": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "user_avatar_url": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "user_name": {
       "type": [
         "null",
         "string"
       ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/users.json b/_data/taps/schemas/toggl/v1/json/users.json
index 265d4d74e..8b98b251e 100644
--- a/_data/taps/schemas/toggl/v1/json/users.json
+++ b/_data/taps/schemas/toggl/v1/json/users.json
@@ -1,24 +1,10 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
-    "at": {
-      "type": [
-        "null",
-        "date-time"
-      ]
-    },
-    "beginning_of_week": {
-      "type": [
-        "null",
-        "integer"
-      ]
-    },
-    "date_format": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "default_wid": {
+    "id": {
       "type": [
         "null",
         "integer"
@@ -36,105 +22,41 @@
         "string"
       ]
     },
-    "id": {
-      "type": [
-        "null",
-        "integer"
-      ]
-    },
-    "image_url": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "invitation": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "jquery_date_format": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "jquery_timeofday_format": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "language": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "new_blog_post": {
-      "type": [
-        "null",
-        "string"
-      ]
-    },
-    "record_timeline": {
+    "is_active": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "render_timeline": {
+    "is_admin": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "retention": {
-      "type": [
-        "null",
-        "integer"
-      ]
-    },
-    "should_upgrade": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "sidebar_piechart": {
-      "type": [
-        "null",
-        "boolean"
-      ]
-    },
-    "store_start_and_stop_time": {
+    "inactive": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "timeline_enabled": {
+    "role": {
       "type": [
         "null",
-        "boolean"
+        "string"
       ]
     },
-    "timeline_experiment": {
+    "2fa_enabled": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "timeofday_format": {
+    "timezone": {
       "type": [
         "null",
         "string"
       ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/workspace_users.json b/_data/taps/schemas/toggl/v1/json/workspace_users.json
index f7f673341..a6669d04f 100644
--- a/_data/taps/schemas/toggl/v1/json/workspace_users.json
+++ b/_data/taps/schemas/toggl/v1/json/workspace_users.json
@@ -1,9 +1,25 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
-    "active": {
+    "id": {
       "type": [
         "null",
-        "boolean"
+        "integer"
+      ]
+    },
+    "uid": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "wid": {
+      "type": [
+        "null",
+        "integer"
       ]
     },
     "admin": {
@@ -12,10 +28,10 @@
         "boolean"
       ]
     },
-    "at": {
+    "active": {
       "type": [
         "null",
-        "date-time"
+        "boolean"
       ]
     },
     "email": {
@@ -24,39 +40,149 @@
         "string"
       ]
     },
-    "id": {
+    "inactive": {
       "type": [
         "null",
-        "integer"
+        "boolean"
       ]
     },
+    "at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "group_ids": {
+      "type": [
+        "null",
+        "array"
+      ],
+      "items": {
+        "type": [
+          "integer"
+        ]
+      }
+    },
     "invite_url": {
       "type": [
         "null",
         "string"
       ]
     },
-    "name": {
+    "role": {
       "type": [
         "null",
         "string"
       ]
     },
-    "uid": {
+    "2fa_enabled": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "avatar_file_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "invitation_code": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "is_direct": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "labor_cost": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "labor_cost_last_updated": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "organization_admin": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "rate": {
+      "type": [
+        "null",
+        "number"
+      ]
+    },
+    "rate_last_updated": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "role_id": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "wid": {
+    "timezone": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "view_edit_billable_rates": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "view_edit_labor_costs": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "working_hours_in_minutes": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "workspace_admin": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "user_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "workspace_id": {
       "type": [
         "null",
         "integer"
       ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}
diff --git a/_data/taps/schemas/toggl/v1/json/workspaces.json b/_data/taps/schemas/toggl/v1/json/workspaces.json
index e157fde44..4c8ac2ca2 100644
--- a/_data/taps/schemas/toggl/v1/json/workspaces.json
+++ b/_data/taps/schemas/toggl/v1/json/workspaces.json
@@ -1,15 +1,49 @@
 {
+  "type": [
+    "null",
+    "object"
+  ],
   "properties": {
+    "id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "organization_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "premium": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "business_ws": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
     "admin": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "at": {
+    "default_hourly_rate": {
       "type": [
         "null",
-        "date-time"
+        "integer"
       ]
     },
     "default_currency": {
@@ -18,63 +52,209 @@
         "string"
       ]
     },
-    "default_hourly_rate": {
+    "only_admins_may_create_projects": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "rounding": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "id": {
+    "rounding_minutes": {
       "type": [
         "null",
         "integer"
       ]
     },
+    "at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
     "logo_url": {
       "type": [
         "null",
         "string"
       ]
     },
-    "name": {
+    "ical_url": {
       "type": [
         "null",
         "string"
       ]
     },
-    "only_admins_may_create_projects": {
+    "disable_approvals": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "only_admins_see_billable_rates": {
+    "disable_timesheet_view": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "premium": {
+    "hide_start_end_times": {
       "type": [
         "null",
         "boolean"
       ]
     },
-    "rounding": {
+    "ical_enabled": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "last_modified": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "limit_public_project_data": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "only_admins_may_create_tags": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "only_admins_see_team_dashboard": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "projects_billable_by_default": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "projects_enforce_billable": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "projects_private_by_default": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "rate_last_updated": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "reports_collapse": {
+      "type": [
+        "null",
+        "boolean"
+      ]
+    },
+    "role": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "server_deleted_at": {
+      "type": [
+        "null",
+        "string"
+      ]
+
+    },
+    "profile": {
+        "type": [
+          "null",
+          "integer"
+        ]
+      },
+    "active_users": {
+        "type": [
+          "null",
+          "integer"
+        ]
+    },
+    "created_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "deleted_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "organization_name": {
       "type": [
         "null",
         "integer"
       ]
     },
-    "rounding_minutes": {
+    "role_code": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "role_id": {
+      "type": [
+        "null",
+        "integer"
+      ]
+    },
+    "role_name": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "status": {
+      "type": [
+        "null",
+        "string"
+      ]
+    },
+    "total_users": {
       "type": [
         "null",
         "integer"
       ]
+    },
+    "updated_at": {
+      "type": [
+        "null",
+        "string"
+      ],
+      "format": "date-time"
+    },
+    "user_status": {
+      "type": [
+        "null",
+        "string"
+      ]
     }
-  },
-  "type": [
-    "null",
-    "object"
-  ]
-}
\ No newline at end of file
+  }
+}