diff --git a/src/modules/app/app.module.ts b/src/modules/app/app.module.ts
index 4b95b31..8de012e 100644
--- a/src/modules/app/app.module.ts
+++ b/src/modules/app/app.module.ts
@@ -6,6 +6,7 @@ import {AppComponent} from './app.component';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
 
 import {LayoutModule} from '@angular/cdk/layout';
+import {MatAutocompleteModule} from '@angular/material/autocomplete';
 import {MatToolbarModule} from '@angular/material/toolbar';
 import {MatButtonModule} from '@angular/material/button';
 import {MatSidenavModule} from '@angular/material/sidenav';
@@ -36,6 +37,7 @@ import { EdcConnectorClient } from "@think-it-labs/edc-connector-client";
     MatIconModule,
     MatListModule,
     EdcDemoModule,
+    MatAutocompleteModule,
     MatSnackBarModule
   ],
   declarations: [
diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html
index ddbb7fa..9189521 100644
--- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html
+++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.html
@@ -19,30 +19,47 @@
       <mat-label>Version</mat-label>
       <input [(ngModel)]="version" matInput [placeholder]="'1.0'">
     </mat-form-field>
-  </div>
-
-  <div>
     <mat-form-field class="form-field" color="accent" id="form-field-destination">
       <mat-label>Destination</mat-label>
-      <mat-select [(ngModel)]="storageTypeId" disabled>
-        <mat-option value="HttpData">
-          HttpData
+      <mat-select [(ngModel)]="storageTypeId">
+        <mat-option *ngFor="let storageType of storageTypes " [value]="storageType.id">
+          {{storageType.name}}
         </mat-option>
       </mat-select>
     </mat-form-field>
+    <mat-form-field class="form-field" color="accent" id="form-field-originator">
+      <mat-label>Originator</mat-label>
+      <input [(ngModel)]="originator" matInput [matAutocomplete]="auto">
+      <mat-autocomplete #auto="matAutocomplete">
+        <mat-option *ngFor="let example of originatorExamples" [value]="example">
+          {{example}}
+        </mat-option>
+      </mat-autocomplete>
+    </mat-form-field>
+  </div>
+  <div *ngIf="storageTypeId === 'AzureStorage' || storageTypeId === 'AmazonS3'">
+    <mat-form-field class="form-field" color="accent" id="form-field-account">
+      <mat-label>Account</mat-label>
+      <input [(ngModel)]="account" matInput [placeholder]="'msgedcstorage'">
+    </mat-form-field>
 
+    <mat-form-field class="form-field" color="accent" id="form-field-container">
+      <mat-label>Container</mat-label>
+      <input [(ngModel)]="container" matInput [placeholder]="'src-container'">
+    </mat-form-field>
+
+    <mat-form-field class="form-field" color="accent" id="form-field-blobname">
+      <mat-label>Blob Name</mat-label>
+      <input [(ngModel)]="blobname" matInput>
+    </mat-form-field>
+  </div>
+  <div *ngIf="storageTypeId === 'HttpData'">
     <mat-form-field class="form-field" color="accent" id="form-field-baseUrl">
       <mat-label>Base URL</mat-label>
       <input [(ngModel)]="baseUrl" matInput>
     </mat-form-field>
   </div>
-
   <div>
-    <mat-form-field class="form-field" color="accent" id="form-field-originator">
-      <mat-label>Originator</mat-label>
-      <input [(ngModel)]="originator" matInput>
-    </mat-form-field>
-
     <mat-checkbox [(ngModel)]="claimComplianceProviderCheckboxChecked" disabled>
       Compliance Check Passed
     </mat-checkbox>
diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss
index e94db37..9c531a6 100644
--- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss
+++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.scss
@@ -1,5 +1,5 @@
 mat-dialog-content {
-    width: 800px;
+    width: 820px;
 }
 
 .form-field {
@@ -8,7 +8,7 @@ mat-dialog-content {
 }
 
 .form-field-full {
-    width: 780px;
+    width: 800px;
 }
 
 mat-card-actions {
diff --git a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts
index 62f3f3d..d0918c6 100644
--- a/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts
+++ b/src/modules/edc-demo/components/asset-editor-dialog/asset-editor-dialog.component.ts
@@ -7,6 +7,7 @@ import { NotificationService } from "../../services/notification.service";
 import { HttpClient } from '@angular/common/http';
 import { MatDialog } from '@angular/material/dialog';
 import { ConfirmationDialogComponent, ConfirmDialogModel } from '../confirmation-dialog/confirmation-dialog.component';
+import { MatAutocompleteModule } from '@angular/material/autocomplete';
 
 
 @Component({
@@ -22,10 +23,15 @@ export class AssetEditorDialog implements OnInit {
   contenttype: string = '';
 
   storageTypeId: string = 'HttpData';
-  account: string = '';
+  account: string = 'msgedcstorage';
   container: string = 'src-container';
+  blobname: string = '';
 
   originator: string = 'http://connector-1:8184/protocol';
+  originatorExamples: string[] = [
+    'http://connector-1:8184/protocol',
+    'https://edc-pr.gxfs.gx4fm.org/api/v1/dsp'
+  ];
   baseUrl: string = "http://techslides.com/demos/samples/sample.txt";
 
   claimsList: string = "";
@@ -158,11 +164,11 @@ export class AssetEditorDialog implements OnInit {
           "@id": "https://www.gaia-x4plcaad.info/claims/service-access-point/fe9f0d7f-3a80-48ef-9630-a7c9c3c1e78f",
           "@type": "gx:ServiceAccessPoint",
           "gx:name": {
-            "@value": "Provider EDC",
+            "@value": "edc_pr",
             "@type": "xsd:string"
           },
           "gx:host": {
-            "@value": "edcdb-pr.gxfs.gx4fm.org/",
+            "@value": "edc-pr.gxfs.gx4fm.org/",
             "@type": "xsd:string"
           },
           "gx:protocol": {
@@ -446,6 +452,10 @@ export class AssetEditorDialog implements OnInit {
         "type": this.storageTypeId,
         "name": this.id,
         "baseUrl": this.baseUrl,
+        "account": this.account,
+        "container": this.container,
+        "blobname": this.blobname,
+        "keyName": `${this.account}-key1`
       }
     };
     this.dialogRef.close({assetInput});
diff --git a/src/modules/edc-demo/edc-demo.module.ts b/src/modules/edc-demo/edc-demo.module.ts
index 7ecf26f..5383753 100644
--- a/src/modules/edc-demo/edc-demo.module.ts
+++ b/src/modules/edc-demo/edc-demo.module.ts
@@ -2,6 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {HttpClientModule} from '@angular/common/http';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {MatAutocompleteModule} from '@angular/material/autocomplete';
 import {MatInputModule} from '@angular/material/input';
 import {MatFormFieldModule} from '@angular/material/form-field';
 import {MatSelectModule} from '@angular/material/select';
@@ -72,6 +73,7 @@ import { ConfirmationDialogComponent } from './components/confirmation-dialog/co
     MatListModule,
     RouterModule,
     MatProgressSpinnerModule,
+    MatAutocompleteModule,
     MatCheckboxModule
   ],
   declarations: [