diff --git a/goentri.com.clickmax.json b/goentri.com.clickmax.json
new file mode 100644
index 00000000..7c5409b9
--- /dev/null
+++ b/goentri.com.clickmax.json
@@ -0,0 +1,27 @@
+{
+  "providerId": "goentri.com",
+  "providerName": "Entri",
+  "serviceId": "clickmax",
+  "serviceName": "ClickMax",
+  "version": 2,
+  "logoUrl": "https://cdn.goentri.com/logo.svg",
+  "description": "Allows user to easily set up dkim record using Entri",
+  "syncPubKeyDomain": "goentri.com",
+  "syncRedirectDomain": "api.goentri.com, goentri.com, entri.com, app.entri.com,app.goentri.com",
+   "variableDescription": "cnamePointsTo is the URL to where the subdomain is pointed ",
+  "sharedProviderName": true,
+  "hostRequired": false,
+  "records": [
+    {
+      "type": "CNAME",
+      "host": "www",
+      "pointsTo": "%cnamePointsTo%",
+      "ttl": 3600
+    },
+    {
+      "type": "REDIR301",
+      "target": "%target%",
+      "host": "@"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/goentri.com.mixo.json b/goentri.com.mixo.json
index ca7bb249..8d454153 100644
--- a/goentri.com.mixo.json
+++ b/goentri.com.mixo.json
@@ -3,36 +3,40 @@
   "providerName": "Entri",
   "serviceId": "mixo",
   "serviceName": "Mixo",
-  "version": 2,
+  "version": 3,
   "logoUrl": "https://cdn.goentri.com/logo.svg",
   "description": "Allows user to easily set up domain using Entri",
   "syncPubKeyDomain": "goentri.com",
   "syncRedirectDomain": "api.goentri.com, goentri.com, entri.com, app.entri.com,app.goentri.com",
-  "variableDescription": "host_txt1 and ost_txt2 are the host for each TXT record,txt1 and txt2 are the value for TXT record, host_cname is the host for the CNAME record and value_cname is the value to point CNAME",
+  "variableDescription": "host_txt1 and host_txt2 are the host for each TXT record,txt1 and txt2 are the value for TXT record, host_cname is the host for the CNAME record and value_cname is the value to point CNAME",
   "sharedProviderName": true,
   "records": [
     {
       "type": "TXT",
-      "host": "%host_txt1%",
-      "data": "%txt1%",
-      "ttl": 3600
-    },
-    {
-      "type": "TXT",
-      "host": "%host_txt2%",
+      "host": "%hosttxt2%",
+      "groupId": "a1",
       "data": "%txt2%",
       "ttl": 3600
     },
     {
       "type": "CNAME",
-      "host": "%host_cname%",
-      "pointsTo": "%value_cname%",
+      "host": "%hostcname%",
+      "groupId": "a1",
+      "pointsTo": "%valuecname%",
       "ttl": 3600
     },
     {
       "type": "REDIR301",
       "target": "%target%",
+      "groupId": "a1",
       "host": "@"
+    },
+    {
+      "type": "TXT",
+      "host": "%hosttxt1%",
+      "groupId": "a2",
+      "data": "%txt1%",
+      "ttl": 3600
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/goentri.com.sendmarc.json b/goentri.com.sendmarc.json
new file mode 100644
index 00000000..e4e9da89
--- /dev/null
+++ b/goentri.com.sendmarc.json
@@ -0,0 +1,29 @@
+{
+  "providerId": "goentri.com",
+  "providerName": "Entri",
+  "serviceId": "sendmarc",
+  "serviceName": "Sendmarc",
+  "version": 1,
+  "logoUrl": "https://cdn.goentri.com/logo.svg",
+  "description": "Allows user to easily set up dkim record using Entri",
+  "syncPubKeyDomain": "goentri.com",
+  "syncRedirectDomain": "api.goentri.com, goentri.com, entri.com, app.entri.com,app.goentri.com",
+  "variableDescription": "cnamePointsTo is the URL to where the subdomain is pointed and thirdPartyDomain is domain to add to SPF merge  ",
+  "sharedProviderName": true,
+  "hostRequired": false,
+  "records": [
+    {
+      "type": "CNAME",
+      "host": "_dmarc",
+      "groupId": "a1",
+      "pointsTo": "%cnamePointsTo%",
+      "ttl": 3600
+    },
+    {
+      "type": "SPFM",
+      "host": "@",
+      "groupId": "a2",
+      "spfRules": "include:%thirdPartyDomain%"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/maileon.com.hosting_and_email.json b/maileon.com.hosting_and_email.json
index 5dad1718..eb2fe027 100644
--- a/maileon.com.hosting_and_email.json
+++ b/maileon.com.hosting_and_email.json
@@ -3,16 +3,19 @@
     "providerName": "Maileon Email Marketing",
     "serviceId": "hosting_and_email",
     "serviceName": "Email Marketing by Maileon",
-    "version": 1,
+    "version": 2,
     "logoUrl": "https://maileon.com/app/themes/maileon/assets/img/logo.svg",
     "description": "Configure Hosting and Email Records for use with Maileon Plattform",
     "syncPubKeyDomain": "maileon.com",
+    "sharedProviderName": true,
+    "sharedServiceName": true,
+    "variableDescription": "cnamehost is CNAME host name for webhosting",
     "hostRequired": true,
     "records": [
         {
             "type": "CNAME",
             "host": "@",
-            "pointsTo": "cname.maileon.com",
+            "pointsTo": "%cnamehost%.maileon.com",
             "ttl": "600"
         },
         {