diff --git a/src/Contracts/FabricMessagesContract.ts b/src/Contracts/FabricMessagesContract.ts
index 7594972de..0b8099f39 100644
--- a/src/Contracts/FabricMessagesContract.ts
+++ b/src/Contracts/FabricMessagesContract.ts
@@ -53,9 +53,8 @@ export enum CosmosDbArtifactType {
 
 export interface FabricNativeDatabaseConnectionInfo {
   accessToken: string;
-  accountName: string;
   databaseName: string;
-  connectionString: string;
+  accountEndpoint: string;
 }
 
 export interface CosmosDBTokenResponse {
diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.test.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.test.tsx
index e8013bcbd..6268ec220 100644
--- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.test.tsx
+++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.test.tsx
@@ -72,7 +72,7 @@ jest.mock("Explorer/Controls/Editor/EditorReact", () => ({
 
 const mockDialogState = {
   showOkCancelModalDialog: jest.fn((title: string, subText: string, okLabel: string, onOk: () => void) => onOk()),
-  showOkModalDialog: () => { },
+  showOkModalDialog: () => {},
 };
 
 jest.mock("Explorer/Controls/Dialog", () => ({
diff --git a/src/hooks/useKnockoutExplorer.ts b/src/hooks/useKnockoutExplorer.ts
index 56e3bbcc1..005234f2d 100644
--- a/src/hooks/useKnockoutExplorer.ts
+++ b/src/hooks/useKnockoutExplorer.ts
@@ -439,7 +439,7 @@ const createExplorerFabric = (params: {
   updateUserContext({
     fabricContext: {
       connectionId: params.connectionId,
-      mirroredConnectionInfo: undefined,
+      mirroredConnectionInfo: undefined, // Set with resource token response
       isReadOnly: params.isReadOnly,
       isVisible: params.isVisible,
       artifactType: params.artifactType,
@@ -454,7 +454,7 @@ const createExplorerFabric = (params: {
         id: "",
         location: "",
         type: "",
-        name: "Mounted",
+        name: "Mounted", // TODO: not used?
         kind: AccountKind.Default,
         properties: {
           documentEndpoint: undefined,
@@ -462,20 +462,21 @@ const createExplorerFabric = (params: {
       },
     });
   } else if (params.artifactType === CosmosDbArtifactType.NATIVE) {
+    // Make it behave like Hosted/AAD/RBAC
     updateUserContext({
       databaseAccount: {
         id: "",
         location: "",
         type: "",
-        name: params.nativeConnectionInfo.accountName,
+        name: "Native", // TODO: not used?
         kind: AccountKind.Default,
         properties: {
-          documentEndpoint: params.nativeConnectionInfo.connectionString, // TODO: verify that <artifactid>.sql.cosmos.fabric.microsoft.com is passed to the client as account endpoint
+          documentEndpoint: params.nativeConnectionInfo.accountEndpoint,
         },
       },
-      // For legacy reasons lots of code expects a connection string login to look and act like an encrypted token login
-      authType: AuthType.EncryptedToken,
-      accessToken: params.nativeConnectionInfo.accessToken,
+      authType: AuthType.AAD,
+      dataPlaneRbacEnabled: true,
+      aadToken: params.nativeConnectionInfo.accessToken,
       masterKey: undefined,
     });
   }