diff --git a/.vscode/launch.json b/.vscode/launch.json
index 3300e7e..b4e9329 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -35,7 +35,7 @@
         "SOCKEYE_DB_CONNECTION": "Server=localhost;Username=postgres;Password=sockeye;Database=sockeye;CommandTimeout=300;",
         "SOCKEYE_DATA_PATH": "c:\\temp\\sockeye",
         "SOCKEYE_USE_URLS": "http://*:7676;",
-        "SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
+        //"SOCKEYE_PERMANENTLY_ERASE_DATABASE":"true",
         //"SOCKEYE_REMOVE_LICENSE_FROM_DB":"true",
         //"SOCKEYE_REPORT_RENDERING_TIMEOUT":"1",
         "SOCKEYE_BACKUP_PG_DUMP_PATH": "C:\\data\\code\\postgres_14\\bin"
diff --git a/client/src/api/open-object-handler.js b/client/src/api/open-object-handler.js
index a83cf40..c28c982 100644
--- a/client/src/api/open-object-handler.js
+++ b/client/src/api/open-object-handler.js
@@ -228,6 +228,13 @@ export default {
             });
             break;
 
+          case socktype.Product:
+            vm.$router.push({
+              name: "product-edit",
+              params: { recordid: tid.id }
+            });
+            break;
+
           default:
             window.$gz.eventBus.$emit(
               "notify-warning",
diff --git a/client/src/components/pick-list.vue b/client/src/components/pick-list.vue
index 0e1bc05..2f86e51 100644
--- a/client/src/components/pick-list.vue
+++ b/client/src/components/pick-list.vue
@@ -265,7 +265,7 @@ export default {
       //default params for when called on init
       if (!pickListParams) {
         pickListParams = {
-          ayaType: this.ayaType
+          sockType: this.ayaType
         };
         if (this.value != null) {
           pickListParams["preselectedIds"] = [this.value];
@@ -370,7 +370,7 @@ export default {
       }
 
       //build parameter
-      const pickListParams = { ayaType: vm.ayaType };
+      const pickListParams = { sockType: vm.ayaType };
       if (!emptyQuery) {
         let query = queryTerms[0];
         if (queryTerms[1] != "[?]") {
diff --git a/client/src/router.js b/client/src/router.js
index e7a41c1..e4e1feb 100644
--- a/client/src/router.js
+++ b/client/src/router.js
@@ -34,10 +34,10 @@ const scrollBehavior = function(to, from, savedPosition) {
     }
 
     // eslint-disable-next-line
-        return new Promise((resolve) => {
+    return new Promise(resolve => {
       // check if any matched route config has meta that requires scrolling to top
       // eslint-disable-next-line
-            if (to.matched.some((m) => m.meta.scrollToTop)) {
+      if (to.matched.some(m => m.meta.scrollToTop)) {
         // coords will be used if no selector is provided,
         // or if the selector didn't match any element.
         position.x = 0;
@@ -339,6 +339,14 @@ export default new Router({
           /* webpackChunkName: "biz" */ "./views/biz-subscription-server-list.vue"
         )
     },
+    {
+      path: "/biz-subscription-server-list/:recordid",
+      name: "subscription-server-edit",
+      component: () =>
+        import(
+          /* webpackChunkName: "biz" */ "./views/biz-subscription-server.vue"
+        )
+    },
     {
       path: "/biz-purchase-list",
       name: "biz-purchase-list",
diff --git a/client/src/views/biz-product.vue b/client/src/views/biz-product.vue
index 3b60dc5..db9b777 100644
--- a/client/src/views/biz-product.vue
+++ b/client/src/views/biz-product.vue
@@ -54,6 +54,7 @@
               :label="$sock.t('ProductVendorCode')"
               data-cy="vendorCode"
               :error-messages="form().serverErrors(this, 'vendorCode')"
+              :rules="[form().required(this, 'vendorCode')]"
               @input="fieldValueChanged('vendorCode')"
             ></v-text-field>
           </v-col>
@@ -73,6 +74,7 @@
               :label="$sock.t('ProductOurCode')"
               data-cy="ourCode"
               :error-messages="form().serverErrors(this, 'ourCode')"
+              :rules="[form().required(this, 'ourCode')]"
               @input="fieldValueChanged('ourCode')"
             ></v-text-field>
           </v-col>
@@ -185,8 +187,7 @@ export default {
         vendorCode: null,
         ourCode: null,
         wiki: null,
-        tags: [],
-        sType: 0
+        tags: []
       },
       formState: {
         ready: false,
diff --git a/client/src/views/biz-purchase.vue b/client/src/views/biz-purchase.vue
index 79b1fb3..dfe3c9e 100644
--- a/client/src/views/biz-purchase.vue
+++ b/client/src/views/biz-purchase.vue
@@ -241,14 +241,21 @@ export default {
       obj: {
         id: 0,
         concurrency: 0,
-        name: null,
-        active: true,
+        customerId: 0,
         vendorId: 1,
-        vendorCode: null,
-        ourCode: null,
+        productId: 0,
+        salesOrderNumber: null,
+        purchaseDate: window.$gz.locale.nowUTC8601String(),
+        expireDate: null,
+        cancelDate: null,
+        couponCode: null,
+        notes: null,
+        renewNoticeSent: false,
+        quantity: 1,
+        vendorData: null,
+        processedDate: null,
         wiki: null,
-        tags: [],
-        sType: 0
+        tags: []
       },
       formState: {
         ready: false,
diff --git a/client/src/views/biz-subscription-server.vue b/client/src/views/biz-subscription-server.vue
new file mode 100644
index 0000000..93e2897
--- /dev/null
+++ b/client/src/views/biz-subscription-server.vue
@@ -0,0 +1,714 @@
+<template>
+  <div>
+    <gz-report-selector ref="reportSelector"></gz-report-selector>
+    <div v-if="formState.ready">
+      <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
+      <v-form ref="form">
+        <v-row dense>
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-text-field
+              ref="name"
+              v-model="obj.name"
+              dense
+              :readonly="formState.readOnly"
+              :label="$sock.t('SubscriptionServerName')"
+              :rules="[form().required(this, 'name')]"
+              :error-messages="form().serverErrors(this, 'name')"
+              data-cy="name"
+              @input="fieldValueChanged('name')"
+            ></v-text-field>
+          </v-col>
+
+          <v-col
+            v-if="form().showMe(this, 'Vendor')"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+          >
+            <gz-pick-list
+              ref="vendorId"
+              v-model="obj.vendorId"
+              :aya-type="sockTypes().Vendor"
+              show-edit-icon
+              :readonly="formState.readOnly"
+              :label="$sock.t('Vendor')"
+              :error-messages="form().serverErrors(this, 'vendorId')"
+              :rules="[form().required(this, 'vendorId')]"
+              @input="fieldValueChanged('vendorId')"
+            ></gz-pick-list>
+          </v-col>
+
+          <v-col
+            v-if="form().showMe(this, 'SubscriptionServerVendorCode')"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+          >
+            <v-text-field
+              ref="vendorCode"
+              v-model="obj.vendorCode"
+              dense
+              :readonly="formState.readOnly"
+              :label="$sock.t('SubscriptionServerVendorCode')"
+              data-cy="vendorCode"
+              :error-messages="form().serverErrors(this, 'vendorCode')"
+              :rules="[form().required(this, 'vendorCode')]"
+              @input="fieldValueChanged('vendorCode')"
+            ></v-text-field>
+          </v-col>
+
+          <v-col
+            v-if="form().showMe(this, 'SubscriptionServerOurCode')"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+          >
+            <v-text-field
+              ref="ourCode"
+              v-model="obj.ourCode"
+              dense
+              :readonly="formState.readOnly"
+              :label="$sock.t('SubscriptionServerOurCode')"
+              data-cy="ourCode"
+              :error-messages="form().serverErrors(this, 'ourCode')"
+              :rules="[form().required(this, 'ourCode')]"
+              @input="fieldValueChanged('ourCode')"
+            ></v-text-field>
+          </v-col>
+
+          <v-col
+            v-if="form().showMe(this, 'SubscriptionServerLicenseInterval')"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+          >
+            <gz-duration-picker
+              ref="licenseInterval"
+              v-model="obj.licenseInterval"
+              :readonly="formState.readOnly"
+              :label="$sock.t('SubscriptionServerLicenseInterval')"
+              :show-seconds="false"
+              data-cy="licenseInterval"
+              :error-messages="form().serverErrors(this, 'licenseInterval')"
+              @input="fieldValueChanged('licenseInterval')"
+            ></gz-duration-picker>
+          </v-col>
+
+          <v-col
+            v-if="form().showMe(this, 'SubscriptionServerMaintInterval')"
+            cols="12"
+            sm="6"
+            lg="4"
+            xl="3"
+          >
+            <gz-duration-picker
+              ref="maintInterval"
+              v-model="obj.maintInterval"
+              :readonly="formState.readOnly"
+              :label="$sock.t('SubscriptionServerMaintInterval')"
+              :show-seconds="false"
+              data-cy="maintInterval"
+              :error-messages="form().serverErrors(this, 'maintInterval')"
+              @input="fieldValueChanged('maintInterval')"
+            ></gz-duration-picker>
+          </v-col>
+
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              ref="active"
+              v-model="obj.active"
+              dense
+              :readonly="formState.readOnly"
+              :label="$sock.t('Active')"
+              data-cy="active"
+              :error-messages="form().serverErrors(this, 'active')"
+              @change="fieldValueChanged('active')"
+            ></v-checkbox>
+          </v-col>
+          <!-- --------------------------------- -->
+
+          <v-col v-if="form().showMe(this, 'Tags')" cols="12">
+            <gz-tag-picker
+              ref="tags"
+              v-model="obj.tags"
+              :readonly="formState.readOnly"
+              data-cy="tags"
+              :error-messages="form().serverErrors(this, 'tags')"
+              @input="fieldValueChanged('tags')"
+            ></gz-tag-picker>
+          </v-col>
+
+          <v-col v-if="form().showMe(this, 'Wiki')" cols="12">
+            <gz-wiki
+              ref="wiki"
+              v-model="obj.wiki"
+              :aya-type="sockType"
+              :aya-id="obj.id"
+              :readonly="formState.readOnly"
+              @input="fieldValueChanged('wiki')"
+            ></gz-wiki
+          ></v-col>
+
+          <v-col v-if="form().showMe(this, 'Attachments') && obj.id" cols="12">
+            <gz-attachments
+              :readonly="formState.readOnly"
+              :aya-type="sockType"
+              :aya-id="obj.id"
+            ></gz-attachments
+          ></v-col>
+        </v-row>
+      </v-form>
+    </div>
+    <v-overlay :value="!formState.ready || formState.loading">
+      <v-progress-circular indeterminate :size="64" />
+    </v-overlay>
+  </div>
+</template>
+<script>
+const FORM_KEY = "subscription-server-edit";
+const API_BASE_URL = "subscription-server/";
+const FORM_CUSTOM_TEMPLATE_KEY = "SubscriptionServer";
+export default {
+  data() {
+    return {
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      obj: {
+        id: 0,
+        concurrency: 0,
+        name: null,
+        active: true,
+        customerId: 0,
+        notes: null,
+        created:  window.$gz.locale.nowUTC8601String(),
+        dataCenter: null,
+        timeZone: null,
+        dbId: null,
+        lastUpdated: null,
+        subscriptionExpire: null,
+        trial: true,
+        trialContact: null,
+        trialEmail: null,
+        trialCompany: null,
+        operatingSystem: "Ubuntu 22.10",
+        customerSubDomain: null,
+        wiki: null,
+        tags: []
+      },
+      test: {
+        id: 0,
+        concurrency: 0,
+        name: "string",
+        active: true,
+
+        customerId: 0,
+        wiki: "string",
+        tags: ["string"]
+      },
+      formState: {
+        ready: false,
+        dirty: false,
+        valid: true,
+        readOnly: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      },
+      rights: window.$gz.role.defaultRightsObject(),
+      sockType: window.$gz.type.SubscriptionServer
+    };
+  },
+  watch: {
+    formState: {
+      handler: function(val) {
+        if (this.formState.loading) {
+          return;
+        }
+
+        if (val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":save");
+        } else {
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+        }
+
+        if (!val.dirty && val.valid && !val.readOnly) {
+          window.$gz.eventBus.$emit(
+            "menu-enable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-enable-item", FORM_KEY + ":new");
+        } else {
+          window.$gz.eventBus.$emit(
+            "menu-disable-item",
+            FORM_KEY + ":duplicate"
+          );
+          window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":new");
+        }
+      },
+      deep: true
+    }
+  },
+  async created() {
+    const vm = this;
+    try {
+      await initForm(vm);
+      vm.rights = window.$gz.role.getRights(window.$gz.type.SubscriptionServer);
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      //---------------------------------
+      let setDirty = false;
+      //id 0 means create or duplicate to new
+      if (vm.$route.params.recordid != 0) {
+        //is there already an obj from a prior operation?
+        if (this.$route.params.obj) {
+          //yes, no need to fetch it
+          this.obj = this.$route.params.obj;
+        } else {
+          await vm.getDataFromApi(vm.$route.params.recordid);
+        }
+      } else {
+        //Might be a duplicate and contain another record
+        if (this.$route.params.obj) {
+          this.obj = this.$route.params.obj;
+          this.obj.concurrency = undefined;
+          this.obj.id = 0;
+          this.obj.name = `${this.obj.name} - ${window.$gz.translation.get(
+            "Copy"
+          )}`;
+          setDirty = true;
+        }
+      }
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: false,
+        dirty: setDirty,
+        valid: true
+      });
+      //----------------------------
+      generateMenu(vm);
+    } catch (error) {
+      window.$gz.errorHandler.handleFormError(error, vm);
+    } finally {
+      vm.formState.ready = true;
+    }
+  },
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty || JUST_DELETED) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
+      next();
+    } else {
+      next(false);
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  methods: {
+    canSave: function() {
+      return this.formState.valid && this.formState.dirty;
+    },
+    canDuplicate: function() {
+      return this.formState.valid && !this.formState.dirty;
+    },
+    sockTypes: function() {
+      return window.$gz.type;
+    },
+    form() {
+      return window.$gz.form;
+    },
+    fieldValueChanged(ref) {
+      if (
+        this.formState.ready &&
+        !this.formState.loading &&
+        !this.formState.readOnly
+      ) {
+        window.$gz.form.fieldValueChanged(this, ref);
+      }
+    },
+    async getDataFromApi(recordId) {
+      const vm = this;
+      window.$gz.form.setFormState({
+        vm: vm,
+        loading: true
+      });
+      if (!recordId) {
+        throw new Error(FORM_KEY + "::getDataFromApi -> Missing recordID!");
+      }
+      try {
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        const res = await window.$gz.api.get(API_BASE_URL + recordId);
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.form.handleObjectNotFound(vm);
+          }
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          vm.obj = res.data;
+          generateMenu(vm);
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true,
+            loading: false
+          });
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async submit() {
+      const vm = this;
+      if (vm.canSave == false) {
+        return;
+      }
+      try {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: true
+        });
+        window.$gz.form.deleteAllErrorBoxErrors(vm);
+        const res = await window.$gz.api.upsert(API_BASE_URL, vm.obj);
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          if (res.data.id) {
+            //POST
+            vm.obj = res.data;
+            this.$router.replace({
+              name: "subscription-server-edit",
+              params: {
+                recordid: res.data.id,
+                obj: res.data
+              }
+            });
+          } else {
+            //PUT
+            vm.obj.concurrency = res.data.concurrency;
+          }
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false,
+            valid: true
+          });
+        }
+      } catch (ex) {
+        window.$gz.errorHandler.handleFormError(ex, vm);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
+        });
+      }
+    },
+    async remove() {
+      try {
+        const dialogResult = await window.$gz.dialog.confirmDelete();
+        if (dialogResult != true) {
+          return;
+        }
+        window.$gz.form.setFormState({
+          vm: this,
+          loading: true
+        });
+
+        if (this.$route.params.recordid == 0) {
+          JUST_DELETED = true;
+
+          this.$router.go(-1);
+        } else {
+          window.$gz.form.deleteAllErrorBoxErrors(this);
+          const res = await window.$gz.api.remove(
+            API_BASE_URL + this.$route.params.recordid
+          );
+          if (res.error) {
+            this.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(this);
+          } else {
+            JUST_DELETED = true;
+            this.$router.go(-1);
+          }
+        }
+      } catch (error) {
+        window.$gz.errorHandler.handleFormError(error, this);
+      } finally {
+        window.$gz.form.setFormState({
+          vm: this,
+          loading: false
+        });
+      }
+    },
+    duplicate() {
+      this.$router.push({
+        name: "subscription-server-edit",
+        params: {
+          recordid: 0,
+          obj: this.obj
+        }
+      });
+    }
+  }
+};
+
+/////////////////////////////
+//
+//
+async function clickHandler(menuItem) {
+  if (!menuItem) {
+    return;
+  }
+  const m = window.$gz.menu.parseMenuItem(menuItem);
+  if (m.owner == FORM_KEY && !m.disabled) {
+    switch (m.key) {
+      case "save":
+        m.vm.submit();
+        break;
+      case "delete":
+        m.vm.remove();
+        break;
+      case "new":
+        m.vm.$router.push({
+          name: "subscription-server-edit",
+          params: { recordid: 0 }
+        });
+        break;
+      case "duplicate":
+        m.vm.duplicate();
+        break;
+      case "report":
+        {
+          const res = await m.vm.$refs.reportSelector.open(
+            {
+              AType: window.$gz.type.SubscriptionServer,
+              selectedRowIds: [m.vm.obj.id]
+            },
+            m.id
+          );
+          if (res == null) {
+            return;
+          }
+          window.$gz.form.setLastReportMenuItem(FORM_KEY, res, m.vm);
+        }
+        break;
+      case "WorkOrderList":
+        m.vm.$router.push({
+          name: "svc-workorders",
+          params: {
+            aType: m.vm.sockType,
+            objectId: m.vm.obj.id,
+            name: m.vm.obj.name
+          }
+        });
+        break;
+      case "QuoteList":
+        m.vm.$router.push({
+          name: "svc-quotes",
+          params: {
+            aType: m.vm.sockType,
+            objectId: m.vm.obj.id,
+            name: m.vm.obj.name
+          }
+        });
+        break;
+      case "PMList":
+        m.vm.$router.push({
+          name: "svc-pms",
+          params: {
+            aType: m.vm.sockType,
+            objectId: m.vm.obj.id,
+            name: m.vm.obj.name
+          }
+        });
+        break;
+      default:
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          FORM_KEY + "::context click: [" + m.key + "]"
+        );
+    }
+  }
+}
+
+//////////////////////
+//
+//
+function generateMenu(vm) {
+  const menuOptions = {
+    isMain: false,
+    readOnly: vm.formState.readOnly,
+    icon: "$sockiBarCode",
+    title: "SubscriptionServer",
+    helpUrl: "svc-subscription-servers",
+    formData: {
+      sockType: window.$gz.type.SubscriptionServer,
+      recordId: vm.$route.params.recordid,
+      formCustomTemplateKey: FORM_CUSTOM_TEMPLATE_KEY,
+      recordName: vm.obj.name
+    },
+    menuItems: []
+  };
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "Save",
+      icon: "$sockiSave",
+      surface: true,
+      key: FORM_KEY + ":save",
+      vm: vm
+    });
+  }
+
+  menuOptions.menuItems.push({
+    title: "Report",
+    icon: "$sockiFileAlt",
+    key: FORM_KEY + ":report",
+    vm: vm
+  });
+
+  const lastReport = window.$gz.form.getLastReport(FORM_KEY);
+  if (lastReport != null) {
+    menuOptions.menuItems.push({
+      title: lastReport.name,
+      notrans: true,
+      icon: "$sockiFileAlt",
+      key: FORM_KEY + ":report:" + lastReport.id,
+      vm: vm
+    });
+  }
+
+  if (vm.rights.change) {
+    menuOptions.menuItems.push({
+      title: "New",
+      icon: "$sockiPlus",
+      key: FORM_KEY + ":new",
+      vm: vm
+    });
+  }
+
+  if (vm.rights.change && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Duplicate",
+      icon: "$sockiClone",
+      key: FORM_KEY + ":duplicate",
+      vm: vm
+    });
+  }
+  if (vm.rights.delete && vm.$route.params.recordid != 0) {
+    menuOptions.menuItems.push({
+      title: "Delete",
+      icon: "$sockiTrashAlt",
+      surface: false,
+      key: FORM_KEY + ":delete",
+      vm: vm
+    });
+  }
+  menuOptions.menuItems.push({ divider: true, inset: false });
+
+  menuOptions.menuItems.push({
+    title: "WorkOrderList",
+    icon: "$sockiTools",
+    key: FORM_KEY + ":WorkOrderList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "QuoteList",
+    icon: "$sockiPencilAlt",
+    key: FORM_KEY + ":QuoteList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({
+    title: "PMList",
+    icon: "$sockiBusinessTime",
+    key: FORM_KEY + ":PMList",
+    vm: vm
+  });
+
+  menuOptions.menuItems.push({ divider: true, inset: false });
+  window.$gz.eventBus.$emit("menu-change", menuOptions);
+}
+
+let JUST_DELETED = false;
+
+/////////////////////////////////
+//
+//
+async function initForm(vm) {
+  await fetchTranslatedText();
+  await window.$gz.formCustomTemplate.get(FORM_CUSTOM_TEMPLATE_KEY, vm);
+}
+
+//////////////////////////////////////////////////////////
+//
+// Ensures UI translated text is available
+//
+async function fetchTranslatedText() {
+  await window.$gz.translation.cacheTranslations([
+    "SubscriptionServer",
+    "SubscriptionServerName",
+    "Vendor",
+    "SubscriptionServerLicenseInterval",
+    "SubscriptionServerMaintInterval",
+    "SubscriptionServerSubscriptionServerOverseerID",
+    "SubscriptionServerVendorCode",
+    "SubscriptionServerOurCode"
+  ]);
+}
+/*
+"CREATE TABLE asubscriptionserver (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, active BOOL NOT NULL DEFAULT true, created TIMESTAMPTZ NOT NULL, "
++ "name TEXT NOT NULL, notes TEXT, datacenter TEXT NOT NULL, timezone TEXT NOT NULL, dbid TEXT, lastupdated TIMESTAMPTZ, subscriptionexpire TIMESTAMPTZ NOT NULL, "
++ "trial BOOL NOT NULL DEFAULT true, trialcontact TEXT, trialemail TEXT, trialcompany TEXT, operatingsystem TEXT, customersubdomain TEXT, "
++ "wiki TEXT, tags VARCHAR(255) ARRAY, customerid BIGINT REFERENCES acustomer(id) )"
+[Required]
+public string Name { get; set; }
+public bool Active { get; set; }
+public string Notes { get; set; }
+public DateTime Created { get; set; }
+[Required]
+public string DataCenter { get; set; }
+[Required]
+public string TimeZone { get; set; }
+public string DbId { get; set; }
+public DateTime? LastUpdated { get; set; }
+public DateTime SubscriptionExpire { get; set; }
+public bool Trial { get; set; }
+public string TrialContact { get; set; }
+public string TrialEmail { get; set; }
+public string TrialCompany { get; set; }
+public string OperatingSystem { get; set; }
+public string CustomerSubDomain { get; set; }
+public long? CustomerId { get; set; }
+public string Wiki { get; set; }
+public List<string> Tags { get; set; }
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServer', 'Subscription server' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubscriptionServerList', 'Subscription servers' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerName', 'Name' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerNotes', 'Notes' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerDatacenter', 'Data center' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTimeZone', 'Time zone' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerLastUpdated', 'Last updated' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerSubExpire', 'Subscription expires' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTrialContact', 'Trial contact' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTrialEmail', 'TrialEmail' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTrial', 'Trial' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerTrialCompany', 'Trial company' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerOperatingSystem', 'OS' FROM atranslation t  where t.baselanguage = 'en'");
+await ExecQueryAsync("INSERT INTO atranslationitem(translationid,key,display) SELECT t.id, 'SubServerCustomerDomain', 'Customer subdomain' FROM atranslation t  where t.baselanguage = 'en'");
+
+
+ */
+</script>
diff --git a/server/Startup.cs b/server/Startup.cs
index 2a094a0..9a5801d 100644
--- a/server/Startup.cs
+++ b/server/Startup.cs
@@ -37,7 +37,7 @@ namespace Sockeye
             _hostingEnvironment = hostingEnvironment;
             Sockeye.Util.ApplicationLogging.LoggerProvider = nlogLoggerProvider;
             ServerBootConfig.SOCKEYE_CONTENT_ROOT_PATH = hostingEnvironment.ContentRootPath;
-           
+
         }
 
         private readonly ILogger _newLog;
@@ -246,7 +246,7 @@ namespace Sockeye
                                 });
                 }
             );
-
+            services.AddSwaggerGenNewtonsoftSupport();
 
             #endregion
 
@@ -635,7 +635,7 @@ namespace Sockeye
             ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("DB Schema version", Sockeye.Util.AySchema.currentSchema.ToString());
 
 
-          
+
             //Check for SuperUser password override
             if (!string.IsNullOrWhiteSpace(ServerBootConfig.SOCKEYE_SET_SUPERUSER_PW))
             {
diff --git a/server/sockeye.csproj b/server/sockeye.csproj
index e1baba9..742af90 100644
--- a/server/sockeye.csproj
+++ b/server/sockeye.csproj
@@ -41,11 +41,13 @@
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.4" />
     <PackageReference Include="PuppeteerSharp" Version="7.0.0" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.3.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.3.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.4.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.4.0" />
+    
     <PackageReference Include="TwoFactorAuth.Net" Version="1.4.0" />
   </ItemGroup>