diff --git a/opensync-ext-static/src/main/resources/ProfileHotspot20.json b/opensync-ext-static/src/main/resources/ProfileHotspot20.json
index c01b5a7..f8c107f 100644
--- a/opensync-ext-static/src/main/resources/ProfileHotspot20.json
+++ b/opensync-ext-static/src/main/resources/ProfileHotspot20.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 8,
         "customerId": 2,
@@ -63,8 +63,8 @@
             "profileType": "hotspot_2pt0",
             "mccMncList": "302,720"
         },
-        "createdTimestamp": 1601961452370,
-        "lastModifiedTimestamp": 1601961452370,
+        "createdTimestamp": 1602015574677,
+        "lastModifiedTimestamp": 1602015574677,
         "childProfileIds": [
             5,
             6,
diff --git a/opensync-ext-static/src/main/resources/ProfileIdProvider.json b/opensync-ext-static/src/main/resources/ProfileIdProvider.json
index 41daff9..4ea327e 100644
--- a/opensync-ext-static/src/main/resources/ProfileIdProvider.json
+++ b/opensync-ext-static/src/main/resources/ProfileIdProvider.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 7,
         "customerId": 2,
@@ -29,12 +29,19 @@
                     ],
                     "encoding": 0,
                     "eapMethods": [
+                        "EAP-MSCHAP-V2 with username/password",
+                        "EAP-TTLS with username/password",
                         "EAP-TLS with certificate"
                     ],
                     "eapMap": {
+                        "EAP-MSCHAP-V2 with username/password": [
+                            "Non-EAP Inner Authentication Type:MSCHAPV2"
+                        ],
+                        "EAP-TTLS with username/password": [
+                            "Credential Type:username/password"
+                        ],
                         "EAP-TLS with certificate": [
-                            "Softoken",
-                            "Certificate"
+                            "Credential Type:username/password"
                         ]
                     }
                 }
@@ -48,6 +55,7 @@
                     "iconLocale": "en_CA",
                     "iconName": "icon32.png",
                     "filePath": "/tmp/icon32.png",
+                    "imageUrl": "https://localhost:9096",
                     "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
                 }
             ],
@@ -55,14 +63,24 @@
             "radiusProfileAccounting": "Radius-Profile",
             "osuSsid": "TipWlan-cloud-3-radios",
             "osuServerUri": "https://example.com/osu/",
-            "osuFriendlyName": {
-                "model_type": "Hotspot20Duple",
-                "locale": "en_CA",
-                "dupleIso3Language": "eng",
-                "dupleName": "Example provider",
-                "defaultDupleSeparator": ":",
-                "asDuple": "eng:Example provider"
-            },
+            "osuFriendlyName": [
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "en_CA",
+                    "dupleIso3Language": "eng",
+                    "dupleName": "Example provider",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "eng:Example provider"
+                },
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "fr_CA",
+                    "dupleIso3Language": "fra",
+                    "dupleName": "Exemple de fournisseur",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "fra:Exemple de fournisseur"
+                }
+            ],
             "osuNaiStandalone": "anonymous@example.com",
             "osuNaiShared": "anonymous@example.com",
             "osuMethodList": [
@@ -89,10 +107,8 @@
             ],
             "profileType": "id_provider"
         },
-        "createdTimestamp": 1601961451981,
-        "lastModifiedTimestamp": 1601961451981,
-        "childProfileIds": [
-          1
-        ]
+        "createdTimestamp": 1602015574295,
+        "lastModifiedTimestamp": 1602015574295,
+        "childProfileIds": []
     }
     ]
\ No newline at end of file
diff --git a/opensync-ext-static/src/main/resources/ProfileOperator.json b/opensync-ext-static/src/main/resources/ProfileOperator.json
index 1c78d88..54da14f 100644
--- a/opensync-ext-static/src/main/resources/ProfileOperator.json
+++ b/opensync-ext-static/src/main/resources/ProfileOperator.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 5,
         "customerId": 2,
@@ -30,8 +30,8 @@
             ],
             "profileType": "operator"
         },
-        "createdTimestamp": 1601961451776,
-        "lastModifiedTimestamp": 1601961451776,
+        "createdTimestamp": 1602015573969,
+        "lastModifiedTimestamp": 1602015573969,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-ext-static/src/main/resources/ProfileVenue.json b/opensync-ext-static/src/main/resources/ProfileVenue.json
index afa8f75..6dee334 100644
--- a/opensync-ext-static/src/main/resources/ProfileVenue.json
+++ b/opensync-ext-static/src/main/resources/ProfileVenue.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 6,
         "customerId": 2,
@@ -35,8 +35,8 @@
             },
             "profileType": "venue"
         },
-        "createdTimestamp": 1601961451781,
-        "lastModifiedTimestamp": 1601961451781,
+        "createdTimestamp": 1602015573975,
+        "lastModifiedTimestamp": 1602015573975,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json
index c01b5a7..f8c107f 100644
--- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json
+++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileHotspot20.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 8,
         "customerId": 2,
@@ -63,8 +63,8 @@
             "profileType": "hotspot_2pt0",
             "mccMncList": "302,720"
         },
-        "createdTimestamp": 1601961452370,
-        "lastModifiedTimestamp": 1601961452370,
+        "createdTimestamp": 1602015574677,
+        "lastModifiedTimestamp": 1602015574677,
         "childProfileIds": [
             5,
             6,
diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json
index 41daff9..4ea327e 100644
--- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json
+++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileIdProvider.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 7,
         "customerId": 2,
@@ -29,12 +29,19 @@
                     ],
                     "encoding": 0,
                     "eapMethods": [
+                        "EAP-MSCHAP-V2 with username/password",
+                        "EAP-TTLS with username/password",
                         "EAP-TLS with certificate"
                     ],
                     "eapMap": {
+                        "EAP-MSCHAP-V2 with username/password": [
+                            "Non-EAP Inner Authentication Type:MSCHAPV2"
+                        ],
+                        "EAP-TTLS with username/password": [
+                            "Credential Type:username/password"
+                        ],
                         "EAP-TLS with certificate": [
-                            "Softoken",
-                            "Certificate"
+                            "Credential Type:username/password"
                         ]
                     }
                 }
@@ -48,6 +55,7 @@
                     "iconLocale": "en_CA",
                     "iconName": "icon32.png",
                     "filePath": "/tmp/icon32.png",
+                    "imageUrl": "https://localhost:9096",
                     "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
                 }
             ],
@@ -55,14 +63,24 @@
             "radiusProfileAccounting": "Radius-Profile",
             "osuSsid": "TipWlan-cloud-3-radios",
             "osuServerUri": "https://example.com/osu/",
-            "osuFriendlyName": {
-                "model_type": "Hotspot20Duple",
-                "locale": "en_CA",
-                "dupleIso3Language": "eng",
-                "dupleName": "Example provider",
-                "defaultDupleSeparator": ":",
-                "asDuple": "eng:Example provider"
-            },
+            "osuFriendlyName": [
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "en_CA",
+                    "dupleIso3Language": "eng",
+                    "dupleName": "Example provider",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "eng:Example provider"
+                },
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "fr_CA",
+                    "dupleIso3Language": "fra",
+                    "dupleName": "Exemple de fournisseur",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "fra:Exemple de fournisseur"
+                }
+            ],
             "osuNaiStandalone": "anonymous@example.com",
             "osuNaiShared": "anonymous@example.com",
             "osuMethodList": [
@@ -89,10 +107,8 @@
             ],
             "profileType": "id_provider"
         },
-        "createdTimestamp": 1601961451981,
-        "lastModifiedTimestamp": 1601961451981,
-        "childProfileIds": [
-          1
-        ]
+        "createdTimestamp": 1602015574295,
+        "lastModifiedTimestamp": 1602015574295,
+        "childProfileIds": []
     }
     ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json
index 1c78d88..54da14f 100644
--- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json
+++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileOperator.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 5,
         "customerId": 2,
@@ -30,8 +30,8 @@
             ],
             "profileType": "operator"
         },
-        "createdTimestamp": 1601961451776,
-        "lastModifiedTimestamp": 1601961451776,
+        "createdTimestamp": 1602015573969,
+        "lastModifiedTimestamp": 1602015573969,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json
index afa8f75..6dee334 100644
--- a/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json
+++ b/opensync-gateway-static-docker/src/main/docker-opensync-gateway-and-mqtt/app/opensync/ProfileVenue.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 6,
         "customerId": 2,
@@ -35,8 +35,8 @@
             },
             "profileType": "venue"
         },
-        "createdTimestamp": 1601961451781,
-        "lastModifiedTimestamp": 1601961451781,
+        "createdTimestamp": 1602015573975,
+        "lastModifiedTimestamp": 1602015573975,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json
index c01b5a7..f8c107f 100644
--- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json
+++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileHotspot20.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 8,
         "customerId": 2,
@@ -63,8 +63,8 @@
             "profileType": "hotspot_2pt0",
             "mccMncList": "302,720"
         },
-        "createdTimestamp": 1601961452370,
-        "lastModifiedTimestamp": 1601961452370,
+        "createdTimestamp": 1602015574677,
+        "lastModifiedTimestamp": 1602015574677,
         "childProfileIds": [
             5,
             6,
diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json
index 41daff9..4ea327e 100644
--- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json
+++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileIdProvider.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 7,
         "customerId": 2,
@@ -29,12 +29,19 @@
                     ],
                     "encoding": 0,
                     "eapMethods": [
+                        "EAP-MSCHAP-V2 with username/password",
+                        "EAP-TTLS with username/password",
                         "EAP-TLS with certificate"
                     ],
                     "eapMap": {
+                        "EAP-MSCHAP-V2 with username/password": [
+                            "Non-EAP Inner Authentication Type:MSCHAPV2"
+                        ],
+                        "EAP-TTLS with username/password": [
+                            "Credential Type:username/password"
+                        ],
                         "EAP-TLS with certificate": [
-                            "Softoken",
-                            "Certificate"
+                            "Credential Type:username/password"
                         ]
                     }
                 }
@@ -48,6 +55,7 @@
                     "iconLocale": "en_CA",
                     "iconName": "icon32.png",
                     "filePath": "/tmp/icon32.png",
+                    "imageUrl": "https://localhost:9096",
                     "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
                 }
             ],
@@ -55,14 +63,24 @@
             "radiusProfileAccounting": "Radius-Profile",
             "osuSsid": "TipWlan-cloud-3-radios",
             "osuServerUri": "https://example.com/osu/",
-            "osuFriendlyName": {
-                "model_type": "Hotspot20Duple",
-                "locale": "en_CA",
-                "dupleIso3Language": "eng",
-                "dupleName": "Example provider",
-                "defaultDupleSeparator": ":",
-                "asDuple": "eng:Example provider"
-            },
+            "osuFriendlyName": [
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "en_CA",
+                    "dupleIso3Language": "eng",
+                    "dupleName": "Example provider",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "eng:Example provider"
+                },
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "fr_CA",
+                    "dupleIso3Language": "fra",
+                    "dupleName": "Exemple de fournisseur",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "fra:Exemple de fournisseur"
+                }
+            ],
             "osuNaiStandalone": "anonymous@example.com",
             "osuNaiShared": "anonymous@example.com",
             "osuMethodList": [
@@ -89,10 +107,8 @@
             ],
             "profileType": "id_provider"
         },
-        "createdTimestamp": 1601961451981,
-        "lastModifiedTimestamp": 1601961451981,
-        "childProfileIds": [
-          1
-        ]
+        "createdTimestamp": 1602015574295,
+        "lastModifiedTimestamp": 1602015574295,
+        "childProfileIds": []
     }
     ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json
index 1c78d88..54da14f 100644
--- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json
+++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileOperator.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 5,
         "customerId": 2,
@@ -30,8 +30,8 @@
             ],
             "profileType": "operator"
         },
-        "createdTimestamp": 1601961451776,
-        "lastModifiedTimestamp": 1601961451776,
+        "createdTimestamp": 1602015573969,
+        "lastModifiedTimestamp": 1602015573969,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json
index afa8f75..6dee334 100644
--- a/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json
+++ b/opensync-gateway-static-docker/src/main/docker/app/opensync/ProfileVenue.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 6,
         "customerId": 2,
@@ -35,8 +35,8 @@
             },
             "profileType": "venue"
         },
-        "createdTimestamp": 1601961451781,
-        "lastModifiedTimestamp": 1601961451781,
+        "createdTimestamp": 1602015573975,
+        "lastModifiedTimestamp": 1602015573975,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json
index c01b5a7..f8c107f 100644
--- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json
+++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileHotspot20.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 8,
         "customerId": 2,
@@ -63,8 +63,8 @@
             "profileType": "hotspot_2pt0",
             "mccMncList": "302,720"
         },
-        "createdTimestamp": 1601961452370,
-        "lastModifiedTimestamp": 1601961452370,
+        "createdTimestamp": 1602015574677,
+        "lastModifiedTimestamp": 1602015574677,
         "childProfileIds": [
             5,
             6,
diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json
index 41daff9..4ea327e 100644
--- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json
+++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileIdProvider.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 7,
         "customerId": 2,
@@ -29,12 +29,19 @@
                     ],
                     "encoding": 0,
                     "eapMethods": [
+                        "EAP-MSCHAP-V2 with username/password",
+                        "EAP-TTLS with username/password",
                         "EAP-TLS with certificate"
                     ],
                     "eapMap": {
+                        "EAP-MSCHAP-V2 with username/password": [
+                            "Non-EAP Inner Authentication Type:MSCHAPV2"
+                        ],
+                        "EAP-TTLS with username/password": [
+                            "Credential Type:username/password"
+                        ],
                         "EAP-TLS with certificate": [
-                            "Softoken",
-                            "Certificate"
+                            "Credential Type:username/password"
                         ]
                     }
                 }
@@ -48,6 +55,7 @@
                     "iconLocale": "en_CA",
                     "iconName": "icon32.png",
                     "filePath": "/tmp/icon32.png",
+                    "imageUrl": "https://localhost:9096",
                     "hs20IconString": "32:32:eng:image/png:icon32.png:/tmp/icon32.png"
                 }
             ],
@@ -55,14 +63,24 @@
             "radiusProfileAccounting": "Radius-Profile",
             "osuSsid": "TipWlan-cloud-3-radios",
             "osuServerUri": "https://example.com/osu/",
-            "osuFriendlyName": {
-                "model_type": "Hotspot20Duple",
-                "locale": "en_CA",
-                "dupleIso3Language": "eng",
-                "dupleName": "Example provider",
-                "defaultDupleSeparator": ":",
-                "asDuple": "eng:Example provider"
-            },
+            "osuFriendlyName": [
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "en_CA",
+                    "dupleIso3Language": "eng",
+                    "dupleName": "Example provider",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "eng:Example provider"
+                },
+                {
+                    "model_type": "Hotspot20Duple",
+                    "locale": "fr_CA",
+                    "dupleIso3Language": "fra",
+                    "dupleName": "Exemple de fournisseur",
+                    "defaultDupleSeparator": ":",
+                    "asDuple": "fra:Exemple de fournisseur"
+                }
+            ],
             "osuNaiStandalone": "anonymous@example.com",
             "osuNaiShared": "anonymous@example.com",
             "osuMethodList": [
@@ -89,10 +107,8 @@
             ],
             "profileType": "id_provider"
         },
-        "createdTimestamp": 1601961451981,
-        "lastModifiedTimestamp": 1601961451981,
-        "childProfileIds": [
-          1
-        ]
+        "createdTimestamp": 1602015574295,
+        "lastModifiedTimestamp": 1602015574295,
+        "childProfileIds": []
     }
     ]
\ No newline at end of file
diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json
index 1c78d88..54da14f 100644
--- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json
+++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileOperator.json
@@ -1,5 +1,5 @@
 [
- {
+{
         "model_type": "Profile",
         "id": 5,
         "customerId": 2,
@@ -30,8 +30,8 @@
             ],
             "profileType": "operator"
         },
-        "createdTimestamp": 1601961451776,
-        "lastModifiedTimestamp": 1601961451776,
+        "createdTimestamp": 1602015573969,
+        "lastModifiedTimestamp": 1602015573969,
         "childProfileIds": []
     }
 ]
\ No newline at end of file
diff --git a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json
index afa8f75..6dee334 100644
--- a/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json
+++ b/opensync-gateway-static-process/src/main/resources/app/opensync/ProfileVenue.json
@@ -1,5 +1,5 @@
 [
-    {
+{
         "model_type": "Profile",
         "id": 6,
         "customerId": 2,
@@ -35,8 +35,8 @@
             },
             "profileType": "venue"
         },
-        "createdTimestamp": 1601961451781,
-        "lastModifiedTimestamp": 1601961451781,
+        "createdTimestamp": 1602015573975,
+        "lastModifiedTimestamp": 1602015573975,
         "childProfileIds": []
     }
 ]
\ No newline at end of file