diff --git a/ui/src/app/domain/entity/filter.ts b/ui/src/app/domain/entity/entity-attributes.filter.ts
similarity index 54%
rename from ui/src/app/domain/entity/filter.ts
rename to ui/src/app/domain/entity/entity-attributes.filter.ts
index 58d386855..b10cde00f 100644
--- a/ui/src/app/domain/entity/filter.ts
+++ b/ui/src/app/domain/entity/entity-attributes.filter.ts
@@ -1,15 +1,17 @@
 import { MetadataFilter, RelyingPartyOverrides } from '../model/metadata-filter';
-import { DomainTypes } from '../domain.type';
+import { DomainEntityKinds } from '../domain.type';
 import { FilterTarget } from '../model/filter-target';
 
-export class Filter implements MetadataFilter {
-    id = '';
+export class EntityAttributesFilter implements MetadataFilter {
     createdDate?: string;
     modifiedDate?: string;
     version: string;
+    resourceId: string;
 
-    filterName = '';
+    name = '';
     filterEnabled = false;
+    audId: string;
+    type: string;
 
     relyingPartyOverrides = {
         nameIdFormats: [] as string[],
@@ -18,42 +20,47 @@ export class Filter implements MetadataFilter {
 
     attributeRelease = [] as string[];
 
-    filterTarget: FilterTarget = {
+    entityAttributesFilterTarget: FilterTarget = {
         type: 'ENTITY',
         value: ['']
     };
 
-    constructor(obj?: Partial<MetadataFilter>) {
+    constructor(obj?: Partial<EntityAttributesFilter>) {
         Object.assign(this, { ...obj });
     }
 
-    get name(): string {
-        return this.filterName;
+    get id(): string {
+        return this.resourceId;
+    }
+
+    set id(id: string) {
+        this.resourceId = id;
     }
 
     get enabled(): boolean {
         return this.filterEnabled;
     }
 
-    get type(): string {
-        return DomainTypes.filter;
+    get kind(): string {
+        return DomainEntityKinds.filter;
     }
 
     get entityId(): string {
-        return this.filterTarget.value[0];
+        return this.entityAttributesFilterTarget.value[0];
     }
 
     set entityId(val: string) {
-        this.filterTarget.value[0] = val;
+        this.entityAttributesFilterTarget.value[0] = val;
     }
 
     serialize(): any {
         return {
             attributeRelease: this.attributeRelease,
             relyingPartyOverrides: this.relyingPartyOverrides,
-            filterTarget: { ...this.filterTarget },
+            entityAttributesFilterTarget: { ...this.entityAttributesFilterTarget },
             filterEnabled: this.filterEnabled,
-            filterName: this.filterName
+            name: this.name,
+            '@type': 'EntityAttributes'
         };
     }
 }
diff --git a/ui/src/app/domain/entity/provider.ts b/ui/src/app/domain/entity/provider.ts
index f9bbb3692..6d87d0bcd 100644
--- a/ui/src/app/domain/entity/provider.ts
+++ b/ui/src/app/domain/entity/provider.ts
@@ -10,7 +10,7 @@ import {
     IdpSsoDescriptor,
     RelyingPartyOverrides
 } from '../model/metadata-provider';
-import { DomainTypes } from '../domain.type';
+import { DomainEntityKinds } from '../domain.type';
 
 export class Provider implements MetadataProvider {
     id = '';
@@ -59,8 +59,8 @@ export class Provider implements MetadataProvider {
         return this.serviceEnabled;
     }
 
-    get type(): string {
-        return DomainTypes.provider;
+    get kind(): string {
+        return DomainEntityKinds.provider;
     }
 
     serialize(): any {
diff --git a/ui/src/app/domain/model/metadata-base.ts b/ui/src/app/domain/model/metadata-base.ts
index 6a523f16a..fc5ea1ca7 100644
--- a/ui/src/app/domain/model/metadata-base.ts
+++ b/ui/src/app/domain/model/metadata-base.ts
@@ -1,11 +1,3 @@
-import { Organization } from './organization';
-import { MDUI } from './mdui';
-import { Contact } from './contact';
-import { SecurityInfo } from './security-info';
-import { SsoService, LogoutEndpoint } from '../../domain/model/metadata-provider';
-import { IdpSsoDescriptor } from './sso-descriptor';
-import { RelyingPartyOverrides } from './relying-party-overrides';
-
 export interface MetadataBase {
     id?: string;
     createdDate?: string;
@@ -14,7 +6,7 @@ export interface MetadataBase {
 
     name: string;
     enabled: boolean;
-    type: string;
+    kind: string;
 
     serialize(): any;
 }
diff --git a/ui/src/app/domain/model/metadata-filter.ts b/ui/src/app/domain/model/metadata-filter.ts
index 548d6d813..869bbc3c0 100644
--- a/ui/src/app/domain/model/metadata-filter.ts
+++ b/ui/src/app/domain/model/metadata-filter.ts
@@ -1,14 +1,11 @@
-import { RelyingPartyOverrides } from './relying-party-overrides';
 import { MetadataBase } from './metadata-base';
-import { FilterTarget } from './filter-target';
 
 export interface MetadataFilter extends MetadataBase {
     entityId: string;
-    filterName: string;
+    name: string;
     filterEnabled?: boolean;
-    relyingPartyOverrides: RelyingPartyOverrides;
-    attributeRelease: string[];
-    filterTarget: FilterTarget;
+    type: string;
+    resourceId: string;
 
     serialize(): any;
 }