diff --git a/package.json b/package.json
index ce941a0bb..329cced67 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "@angular/platform-browser": "~13.3.5",
     "@angular/platform-browser-dynamic": "~13.3.5",
     "@angular/router": "~13.3.5",
-    "@think-it-labs/edc-connector-client": "^0.2.0-beta-5",
+    "@think-it-labs/edc-connector-client": "^0.2.0-beta-6",
     "rxjs": "~7.8.1",
     "zone.js": "~0.11.4"
   },
diff --git a/src/modules/edc-demo/components/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts b/src/modules/edc-demo/components/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts
index cc9b0cb0e..377f46473 100644
--- a/src/modules/edc-demo/components/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts
+++ b/src/modules/edc-demo/components/contract-definition-editor-dialog/contract-definition-editor-dialog.component.ts
@@ -1,9 +1,9 @@
 import {Component, Inject, OnInit} from '@angular/core';
 import {MAT_DIALOG_DATA, MatDialogRef} from '@angular/material/dialog';
 import {
-  AssetService, PolicyDefinitionResponseDto, PolicyService
+  AssetService, PolicyService
 } from "../../../mgmt-api-client";
-import { Asset, ContractDefinitionInput } from "../../../mgmt-api-client/model"
+import { Asset, ContractDefinitionInput, PolicyDefinition } from "../../../mgmt-api-client/model"
 
 
 @Component({
@@ -13,12 +13,12 @@ import { Asset, ContractDefinitionInput } from "../../../mgmt-api-client/model"
 })
 export class ContractDefinitionEditorDialog implements OnInit {
 
-  policies: Array<PolicyDefinitionResponseDto> = [];
+  policies: Array<PolicyDefinition> = [];
   availableAssets: Asset[] = [];
   name: string = '';
   editMode = false;
-  accessPolicy?: PolicyDefinitionResponseDto;
-  contractPolicy?: PolicyDefinitionResponseDto;
+  accessPolicy?: PolicyDefinition;
+  contractPolicy?: PolicyDefinition;
   assets: Asset[] = [];
   contractDefinition: ContractDefinitionInput = {
     "@id": '',
diff --git a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html
index fdf5cc099..6eee52ec3 100644
--- a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html
+++ b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.html
@@ -3,7 +3,7 @@
   <!--  ID -->
   <mat-form-field class="form-field-stretch" color="accent" id="form-field-id">
     <mat-label>ID</mat-label>
-    <input [(ngModel)]="policyDefinition['@id']" matInput required>
+    <input [(ngModel)]="policyDefinition.id" matInput required>
   </mat-form-field>
 
   <!--  Assigner / Assignee-->
diff --git a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts
index cfea82ea2..5cb13854b 100644
--- a/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts
+++ b/src/modules/edc-demo/components/new-policy-dialog/new-policy-dialog.component.ts
@@ -1,6 +1,5 @@
 import {Component, Inject, OnInit} from '@angular/core';
-import {Policy, PolicyDefinitionResponseDto, PolicyDefinitionRequestDto} from "../../../mgmt-api-client";
-import TypeEnum = Policy.TypeEnum;
+import {PolicyDefinitionInput, PolicyInput} from "../../../mgmt-api-client/model";
 import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
 
 @Component({
@@ -10,11 +9,11 @@ import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog";
 })
 export class NewPolicyDialogComponent implements OnInit {
   editMode: boolean = false;
-  policy: Policy = {
-    "@type": TypeEnum.Set
+  policy: PolicyInput = {
+    "@type": "set"
   };
-  policyDefinition: PolicyDefinitionResponseDto = {
-    "edc:policy": this.policy,
+  policyDefinition: PolicyDefinitionInput = {
+    "policy": this.policy,
     "@id": ''
   };
   permissionsJson: string = '';
@@ -30,20 +29,24 @@ export class NewPolicyDialogComponent implements OnInit {
 
   onSave() {
     if (this.permissionsJson && this.permissionsJson !== '') {
-      this.policy["odrl:permission"] = JSON.parse(this.permissionsJson);
+      this.policy.permission = JSON.parse(this.permissionsJson);
     }
 
     if (this.prohibitionsJson && this.prohibitionsJson !== '') {
-      this.policy["odrl:prohibition"] = JSON.parse(this.prohibitionsJson);
+      this.policy.prohibition = JSON.parse(this.prohibitionsJson);
     }
 
     if (this.obligationsJson && this.obligationsJson !== '') {
-      this.policy["odrl:obligation"] = JSON.parse(this.obligationsJson);
+      this.policy.obligation = JSON.parse(this.obligationsJson);
     }
 
+    this.policy["@context"]="http://www.w3.org/ns/odrl.jsonld"
+
+
     this.dialogRef.close({
-      policy: this.policyDefinition['edc:policy'],
-      id: this.policyDefinition['@id']
+
+      policy : this.policyDefinition.policy,
+      '@id': this.policyDefinition.id
     })
   }
 }
diff --git a/src/modules/edc-demo/components/policy-view/policy-view.component.html b/src/modules/edc-demo/components/policy-view/policy-view.component.html
index 2f278600c..7065d5a4a 100644
--- a/src/modules/edc-demo/components/policy-view/policy-view.component.html
+++ b/src/modules/edc-demo/components/policy-view/policy-view.component.html
@@ -23,7 +23,7 @@
     <mat-card *ngFor="let policyDef of policyDefinitions" class="policy-card">
       <mat-card-header>
         <mat-icon mat-card-avatar>policy</mat-icon>
-        <mat-card-title><span class="code">{{policyDef['@id']}}</span></mat-card-title>
+        <mat-card-title><span class="code">{{policyDef.id}}</span></mat-card-title>
       </mat-card-header>
 
       <mat-card-content>
@@ -31,24 +31,24 @@
         <mat-list dense>
           <mat-list-item>
             <mat-icon mat-list-icon>trip_origin</mat-icon>
-            <div mat-line>{{policyDef['edc:policy']?.assigner || 'n/a'}}</div>
+            <div mat-line>{{policyDef.policy?.assigner || 'n/a'}}</div>
             <div mat-line>Assigner</div>
           </mat-list-item>
           <mat-list-item>
             <mat-icon mat-list-icon>adjust</mat-icon>
-            <div mat-line>{{policyDef['edc:policy']?.assignee || 'n/a'}}</div>
+            <div mat-line>{{policyDef.policy?.assignee || 'n/a'}}</div>
             <div mat-line>Assignee</div>
           </mat-list-item>
         </mat-list>
 
         <!-- Permissions-->
-        <policy-rules [rules]="policyDef['edc:policy']['odrl:permission']" [title]="'Permissions'"></policy-rules>
+        <policy-rules [rules]="policyDef.policy.permissions" [title]="'Permissions'"></policy-rules>
 
         <!-- Obligations-->
-        <policy-rules [rules]="policyDef['edc:policy']['odrl:obligation']" [title]="'Obligations'"></policy-rules>
+        <policy-rules [rules]="policyDef.policy.obligations" [title]="'Obligations'"></policy-rules>
 
         <!-- Prohibitions-->
-        <policy-rules [rules]="policyDef['edc:policy']['odrl:prohibition']" [title]="'Prohibitions'"></policy-rules>
+        <policy-rules [rules]="policyDef.policy.prohibitions" [title]="'Prohibitions'"></policy-rules>
 
       </mat-card-content>
       <button (click)="delete(policyDef)" mat-stroked-button color="warn" matSuffix>
diff --git a/src/modules/edc-demo/components/policy-view/policy-view.component.ts b/src/modules/edc-demo/components/policy-view/policy-view.component.ts
index f7008d6fd..95d4559c1 100644
--- a/src/modules/edc-demo/components/policy-view/policy-view.component.ts
+++ b/src/modules/edc-demo/components/policy-view/policy-view.component.ts
@@ -1,11 +1,12 @@
 import {Component, OnInit} from '@angular/core';
-import {IdResponseDto, PolicyDefinitionResponseDto, PolicyService} from "../../../mgmt-api-client";
+import {PolicyService} from "../../../mgmt-api-client";
 import {BehaviorSubject, Observable, Observer, of} from "rxjs";
 import {first, map, switchMap} from "rxjs/operators";
 import {MatDialog} from "@angular/material/dialog";
 import {NewPolicyDialogComponent} from "../new-policy-dialog/new-policy-dialog.component";
 import {NotificationService} from "../../services/notification.service";
 import {ConfirmationDialogComponent, ConfirmDialogModel} from "../confirmation-dialog/confirmation-dialog.component";
+import {PolicyDefinition, PolicyDefinitionInput, IdResponse} from "../../../mgmt-api-client/model";
 
 @Component({
   selector: 'app-policy-view',
@@ -14,10 +15,10 @@ import {ConfirmationDialogComponent, ConfirmDialogModel} from "../confirmation-d
 })
 export class PolicyViewComponent implements OnInit {
 
-  filteredPolicies$: Observable<PolicyDefinitionResponseDto[]> = of([]);
+  filteredPolicies$: Observable<PolicyDefinition[]> = of([]);
   searchText: string = '';
   private fetch$ = new BehaviorSubject(null);
-  private readonly errorOrUpdateSubscriber: Observer<IdResponseDto>;
+  private readonly errorOrUpdateSubscriber: Observer<IdResponse>;
 
   constructor(private policyService: PolicyService,
               private notificationService: NotificationService,
@@ -30,7 +31,7 @@ export class PolicyViewComponent implements OnInit {
         this.notificationService.showInfo("Successfully completed")
       },
     }
-    
+
   }
 
   ngOnInit(): void {
@@ -50,12 +51,11 @@ export class PolicyViewComponent implements OnInit {
 
   onCreate() {
     const dialogRef = this.dialog.open(NewPolicyDialogComponent);
-    dialogRef.afterClosed().pipe(first()).subscribe({
-      next: (result: PolicyDefinitionResponseDto) => {
-        if (result) {
-          this.policyService.createPolicy(result).subscribe(
+    dialogRef.afterClosed().pipe(first()).subscribe({ next: (newPolicyDefinition: PolicyDefinitionInput) => {
+        if (newPolicyDefinition) {
+          this.policyService.createPolicy(newPolicyDefinition).subscribe(
             {
-              next: (response: IdResponseDto) => this.errorOrUpdateSubscriber.next(response),
+              next: (response: IdResponse) => this.errorOrUpdateSubscriber.next(response),
               error: (error: Error) => this.showError(error, "An error occurred while creating the policy.")
             }
           );
@@ -63,29 +63,29 @@ export class PolicyViewComponent implements OnInit {
       }
     });
   }
-  
+
   /**
    * simple full-text search - serialize to JSON and see if "searchText"
    * is contained
    */
-  private isFiltered(policy: PolicyDefinitionResponseDto, searchText: string) {
+  private isFiltered(policy: PolicyDefinition, searchText: string) {
     return JSON.stringify(policy).includes(searchText);
   }
 
-  delete(policy: PolicyDefinitionResponseDto) {
+  delete(policy: PolicyDefinition) {
 
     let policyId = policy['@id']!;
     const dialogData = ConfirmDialogModel.forDelete("policy", policyId);
 
     const ref = this.dialog.open(ConfirmationDialogComponent, {maxWidth: '20%', data: dialogData});
-  
+
     ref.afterClosed().subscribe({
 
       next: (res: any) => {
         if (res) {
           this.policyService.deletePolicy(policyId).subscribe(
             {
-              next: (response: IdResponseDto) => this.errorOrUpdateSubscriber.next(response),
+              next: (response: IdResponse) => this.errorOrUpdateSubscriber.next(response),
               error: (error: Error) => this.showError(error, "An error occurred while deleting the policy.")
             }
           );
diff --git a/src/modules/mgmt-api-client/api/policy.service.ts b/src/modules/mgmt-api-client/api/policy.service.ts
index b614a2f32..f8a471b4c 100644
--- a/src/modules/mgmt-api-client/api/policy.service.ts
+++ b/src/modules/mgmt-api-client/api/policy.service.ts
@@ -11,28 +11,11 @@
  */
 /* tslint:disable:no-unused-variable member-ordering */
 
-import { Inject, Injectable, Optional }                      from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent, HttpParameterCodec, HttpContext
-        }       from '@angular/common/http';
-import { CustomHttpParameterCodec }                          from '../encoder';
-import { Observable }                                        from 'rxjs';
-
-// @ts-ignore
-import { ApiErrorDetail } from '../model/apiErrorDetail';
-// @ts-ignore
-import { IdResponseDto } from '../model/idResponseDto';
-// @ts-ignore
-import { PolicyDefinitionRequestDto } from '../model/policyDefinitionRequestDto';
-// @ts-ignore
-import { PolicyDefinitionResponseDto } from '../model/policyDefinitionResponseDto';
-// @ts-ignore
-import { QuerySpecDto } from '../model/querySpecDto';
-
-// @ts-ignore
-import { BASE_PATH, COLLECTION_FORMATS }                     from '../variables';
-import { Configuration }                                     from '../configuration';
-
+import {Injectable} from '@angular/core';
+import {HttpResponse, HttpEvent, HttpContext} from '@angular/common/http';
+import {Observable, from} from 'rxjs';
+import {EdcConnectorClient} from "@think-it-labs/edc-connector-client";
+import {Policy, PolicyDefinition, PolicyDefinitionInput, IdResponse, QuerySpec} from "../model"
 
 
 @Injectable({
@@ -40,392 +23,87 @@ import { Configuration }                                     from '../configurat
 })
 export class PolicyService {
 
-    protected basePath = 'http://localhost';
-    public defaultHeaders = new HttpHeaders();
-    public configuration = new Configuration();
-    public encoder: HttpParameterCodec;
-
-    constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string|string[], @Optional() configuration: Configuration) {
-        if (configuration) {
-            this.configuration = configuration;
-        }
-        if (typeof this.configuration.basePath !== 'string') {
-            if (Array.isArray(basePath) && basePath.length > 0) {
-                basePath = basePath[0];
-            }
-
-            if (typeof basePath !== 'string') {
-                basePath = this.basePath;
-            }
-            this.configuration.basePath = basePath;
-        }
-        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
-    }
-
-
-    // @ts-ignore
-    private addToHttpParams(httpParams: HttpParams, value: any, key?: string): HttpParams {
-        if (typeof value === "object" && value instanceof Date === false) {
-            httpParams = this.addToHttpParamsRecursive(httpParams, value);
-        } else {
-            httpParams = this.addToHttpParamsRecursive(httpParams, value, key);
-        }
-        return httpParams;
-    }
-
-    private addToHttpParamsRecursive(httpParams: HttpParams, value?: any, key?: string): HttpParams {
-        if (value == null) {
-            return httpParams;
-        }
-
-        if (typeof value === "object") {
-            if (Array.isArray(value)) {
-                (value as any[]).forEach( elem => httpParams = this.addToHttpParamsRecursive(httpParams, elem, key));
-            } else if (value instanceof Date) {
-                if (key != null) {
-                    httpParams = httpParams.append(key, (value as Date).toISOString().substr(0, 10));
-                } else {
-                   throw Error("key may not be null if value is Date");
-                }
-            } else {
-                Object.keys(value).forEach( k => httpParams = this.addToHttpParamsRecursive(
-                    httpParams, value[k], key != null ? `${key}.${k}` : k));
-            }
-        } else if (key != null) {
-            httpParams = httpParams.append(key, value);
-        } else {
-            throw Error("key may not be null if value is not object or array");
-        }
-        return httpParams;
+  private policyDefinition = this.edcConnectorClient.management.policyDefinitions;
+
+
+  constructor(private edcConnectorClient: EdcConnectorClient) {
+  }
+
+  /**
+   * Creates a new policy definition
+   * @param policyDefinitionRequestDto
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public createPolicy(input: PolicyDefinitionInput, observe?: 'body', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<IdResponse>;
+  public createPolicy(input: PolicyDefinitionInput, observe?: 'response', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpResponse<IdResponse>>;
+  public createPolicy(input: PolicyDefinitionInput, observe?: 'events', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpEvent<IdResponse>>;
+  public createPolicy(input: PolicyDefinitionInput): Observable<any> {
+      return from(this.policyDefinition.create(input));
+  }
+
+  /**
+   * Removes a policy definition with the given ID if possible. Deleting a policy definition is only possible if that policy definition is not yet referenced by a contract definition, in which case an error is returned. DANGER ZONE: Note that deleting policy definitions can have unexpected results, do this at your own risk!
+   * @param id
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public deletePolicy(id: string, observe?: 'body', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<any>;
+  public deletePolicy(id: string, observe?: 'response', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpResponse<any>>;
+  public deletePolicy(id: string, observe?: 'events', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpEvent<any>>;
+  public deletePolicy(id: string): Observable<any> {
+    if (id === null || id === undefined) {
+      throw new Error('Required parameter id was null or undefined when calling deletePolicy.');
     }
-
-    /**
-     * Creates a new policy definition
-     * @param policyDefinitionRequestDto
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public createPolicy(policyDefinitionRequestDto?: PolicyDefinitionRequestDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<IdResponseDto>;
-    public createPolicy(policyDefinitionRequestDto?: PolicyDefinitionRequestDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<IdResponseDto>>;
-    public createPolicy(policyDefinitionRequestDto?: PolicyDefinitionRequestDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<IdResponseDto>>;
-    public createPolicy(policyDefinitionRequestDto?: PolicyDefinitionRequestDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        // to determine the Content-Type header
-        const consumes: string[] = [
-            'application/json'
-        ];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
-        }
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/v2/policydefinitions`;
-        return this.httpClient.request<IdResponseDto>('post', `${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                body: policyDefinitionRequestDto,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     * Removes a policy definition with the given ID if possible. Deleting a policy definition is only possible if that policy definition is not yet referenced by a contract definition, in which case an error is returned. DANGER ZONE: Note that deleting policy definitions can have unexpected results, do this at your own risk!
-     * @param id
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public deletePolicy(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any>;
-    public deletePolicy(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<any>>;
-    public deletePolicy(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<any>>;
-    public deletePolicy(id: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-        if (id === null || id === undefined) {
-            throw new Error('Required parameter id was null or undefined when calling deletePolicy.');
-        }
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/v2/policydefinitions/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
-        return this.httpClient.request<any>('delete', `${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     * Returns all policy definitions according to a query
-     * @param offset
-     * @param limit
-     * @param filter
-     * @param sort
-     * @param sortField
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     * @deprecated
-     */
-    public getAllPolicies(offset?: number, limit?: number, filter?: string, sort?: 'ASC' | 'DESC', sortField?: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<PolicyDefinitionResponseDto>>;
-    public getAllPolicies(offset?: number, limit?: number, filter?: string, sort?: 'ASC' | 'DESC', sortField?: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<PolicyDefinitionResponseDto>>>;
-    public getAllPolicies(offset?: number, limit?: number, filter?: string, sort?: 'ASC' | 'DESC', sortField?: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<PolicyDefinitionResponseDto>>>;
-    public getAllPolicies(offset?: number, limit?: number, filter?: string, sort?: 'ASC' | 'DESC', sortField?: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-
-        let localVarQueryParameters = new HttpParams({encoder: this.encoder});
-        if (offset !== undefined && offset !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>offset, 'offset');
-        }
-        if (limit !== undefined && limit !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>limit, 'limit');
-        }
-        if (filter !== undefined && filter !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>filter, 'filter');
-        }
-        if (sort !== undefined && sort !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>sort, 'sort');
-        }
-        if (sortField !== undefined && sortField !== null) {
-          localVarQueryParameters = this.addToHttpParams(localVarQueryParameters,
-            <any>sortField, 'sortField');
-        }
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/v2/policydefinitions`;
-        return this.httpClient.request<Array<PolicyDefinitionResponseDto>>('get', `${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                params: localVarQueryParameters,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     * Gets a policy definition with the given ID
-     * @param id
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public getPolicy(id: string, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<PolicyDefinitionResponseDto>;
-    public getPolicy(id: string, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<PolicyDefinitionResponseDto>>;
-    public getPolicy(id: string, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<PolicyDefinitionResponseDto>>;
-    public getPolicy(id: string, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-        if (id === null || id === undefined) {
-            throw new Error('Required parameter id was null or undefined when calling getPolicy.');
-        }
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/v2/policydefinitions/${this.configuration.encodeParam({name: "id", value: id, in: "path", style: "simple", explode: false, dataType: "string", dataFormat: undefined})}`;
-        return this.httpClient.request<PolicyDefinitionResponseDto>('get', `${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
-    }
-
-    /**
-     * Returns all policy definitions according to a query
-     * @param querySpecDto
-     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
-     * @param reportProgress flag to report request and response progress.
-     */
-    public queryAllPolicies(querySpecDto?: QuerySpecDto, observe?: 'body', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<Array<PolicyDefinitionResponseDto>>;
-    public queryAllPolicies(querySpecDto?: QuerySpecDto, observe?: 'response', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpResponse<Array<PolicyDefinitionResponseDto>>>;
-    public queryAllPolicies(querySpecDto?: QuerySpecDto, observe?: 'events', reportProgress?: boolean, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<HttpEvent<Array<PolicyDefinitionResponseDto>>>;
-    public queryAllPolicies(querySpecDto?: QuerySpecDto, observe: any = 'body', reportProgress: boolean = false, options?: {httpHeaderAccept?: 'application/json', context?: HttpContext}): Observable<any> {
-
-        let localVarHeaders = this.defaultHeaders;
-
-        let localVarHttpHeaderAcceptSelected: string | undefined = options && options.httpHeaderAccept;
-        if (localVarHttpHeaderAcceptSelected === undefined) {
-            // to determine the Accept header
-            const httpHeaderAccepts: string[] = [
-                'application/json'
-            ];
-            localVarHttpHeaderAcceptSelected = this.configuration.selectHeaderAccept(httpHeaderAccepts);
-        }
-        if (localVarHttpHeaderAcceptSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Accept', localVarHttpHeaderAcceptSelected);
-        }
-
-        let localVarHttpContext: HttpContext | undefined = options && options.context;
-        if (localVarHttpContext === undefined) {
-            localVarHttpContext = new HttpContext();
-        }
-
-
-        // to determine the Content-Type header
-        const consumes: string[] = [
-            'application/json'
-        ];
-        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
-        if (httpContentTypeSelected !== undefined) {
-            localVarHeaders = localVarHeaders.set('Content-Type', httpContentTypeSelected);
-        }
-
-        let responseType_: 'text' | 'json' | 'blob' = 'json';
-        if (localVarHttpHeaderAcceptSelected) {
-            if (localVarHttpHeaderAcceptSelected.startsWith('text')) {
-                responseType_ = 'text';
-            } else if (this.configuration.isJsonMime(localVarHttpHeaderAcceptSelected)) {
-                responseType_ = 'json';
-            } else {
-                responseType_ = 'blob';
-            }
-        }
-
-        let localVarPath = `/v2/policydefinitions/request`;
-        return this.httpClient.request<Array<PolicyDefinitionResponseDto>>('post', `${this.configuration.basePath}${localVarPath}`,
-            {
-                context: localVarHttpContext,
-                body: querySpecDto,
-                responseType: <any>responseType_,
-                withCredentials: this.configuration.withCredentials,
-                headers: localVarHeaders,
-                observe: observe,
-                reportProgress: reportProgress
-            }
-        );
+    return from(this.policyDefinition.delete(id))
+  }
+
+  /**
+   * Returns all policy definitions according to a query
+   * @param offset
+   * @param limit
+   * @param filter
+   * @param sort
+   * @param sortField
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   * @deprecated
+   */
+  public getAllPolicies(querySpec?: QuerySpec, observe?: 'body', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<Array<PolicyDefinition>>;
+  public getAllPolicies(querySpec?: QuerySpec, observe?: 'response', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpResponse<Array<PolicyDefinition>>>;
+  public getAllPolicies(querySpec?: QuerySpec, observe?: 'events', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpEvent<Array<PolicyDefinition>>>;
+  public getAllPolicies(querySpec?: QuerySpec): Observable<any> {
+    return from(this.policyDefinition.queryAll(querySpec))
+  }
+
+  /**
+   * Gets a policy definition with the given ID
+   * @param id
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public getPolicy(id: string, observe?: 'body', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<PolicyDefinition>;
+  public getPolicy(id: string, observe?: 'response', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpResponse<PolicyDefinition>>;
+  public getPolicy(id: string, observe?: 'events', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpEvent<PolicyDefinition>>;
+  public getPolicy(id: string): Observable<any> {
+    if (id === null || id === undefined) {
+      throw new Error('Required parameter id was null or undefined when calling getPolicy.');
     }
 
+    return from(this.policyDefinition.get(id))
+
+  }
+
+  /**
+   * Returns all policy definitions according to a query
+   * @param querySpecDto
+   * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+   * @param reportProgress flag to report request and response progress.
+   */
+  public queryAllPolicies(querySpec?: QuerySpec, observe?: 'body', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<Array<PolicyDefinition>>;
+  public queryAllPolicies(querySpec?: QuerySpec, observe?: 'response', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpResponse<Array<PolicyDefinition>>>;
+  public queryAllPolicies(querySpec?: QuerySpec, observe?: 'events', reportProgress?: boolean, options?: { httpHeaderAccept?: 'application/json', context?: HttpContext }): Observable<HttpEvent<Array<PolicyDefinition>>>;
+  public queryAllPolicies(querySpec?: QuerySpec): Observable<any> {
+      return from(this.policyDefinition.queryAll(querySpec))
+  }
 }
diff --git a/src/modules/mgmt-api-client/model/edc-connector-entities.ts b/src/modules/mgmt-api-client/model/edc-connector-entities.ts
index 97d0b76e3..b21e9f73a 100644
--- a/src/modules/mgmt-api-client/model/edc-connector-entities.ts
+++ b/src/modules/mgmt-api-client/model/edc-connector-entities.ts
@@ -25,6 +25,7 @@ export type {
   Policy,
   PolicyDefinition,
   PolicyDefinitionInput,
+  PolicyInput,
   PolicyType,
   Prohibition,
   QuerySpec,