diff --git a/src/app/commons/component/layout/notification/app.notification.component.ts b/src/app/commons/component/layout/notification/app.notification.component.ts
index 9f3fa75..95b7ef4 100644
--- a/src/app/commons/component/layout/notification/app.notification.component.ts
+++ b/src/app/commons/component/layout/notification/app.notification.component.ts
@@ -3,7 +3,8 @@ import * as ListStore from '@overflow/notification/store/list';
 import * as DetailStore from '@overflow/notification/store/detail';
 import { Store, select } from '@ngrx/store';
 import { ReadAllByMemberSelector, ReadSelector } from '@overflow/notification/store';
-import { Page, PageParams } from '../../../model';
+import { Page } from '@overflow/commons-typescript/model/commons/Page';
+import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
 import { RPCClientError } from '@loafer/ng-rpc';
 import { AuthSelector } from '@overflow/member/store';
 import { Member } from '@overflow/commons-typescript/model/member';
@@ -36,7 +37,7 @@ export class AppNotificationComponent implements OnInit, AfterContentInit, OnDes
     ngOnInit() {
         this.notificationSubscription$ = this.notification$.subscribe(
             (page: Page) => {
-                if (page !== null) {
+                if (page !== null && page !== undefined) {
                     this.notifications = page.content;
                     this.getUnconfirmedCount();
                 }
diff --git a/src/app/commons/model/Page.ts b/src/app/commons/model/Page.ts
deleted file mode 100644
index e64070a..0000000
--- a/src/app/commons/model/Page.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export interface Page {
-    content: any;
-    first: boolean;
-    last: boolean;
-    number: number;
-    numberOfElements: number;
-    size: number;
-    sort: any;
-    totalElements: number;
-    totalPages: number;
-}
-
-// export default Page;
diff --git a/src/app/commons/model/PageParams.ts b/src/app/commons/model/PageParams.ts
deleted file mode 100644
index 1ab0d14..0000000
--- a/src/app/commons/model/PageParams.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface PageParams {
-    pageNo: string;
-    countPerPage: string;
-    sortCol?: string;
-    sortDirection?: string;
-}
-
-// export default PageParams;
diff --git a/src/app/commons/model/index.ts b/src/app/commons/model/index.ts
deleted file mode 100644
index 46f7171..0000000
--- a/src/app/commons/model/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './Page';
-export * from './PageParams';
diff --git a/src/app/pages/infra/infra-page.module.ts b/src/app/pages/infra/infra-page.module.ts
index ca7d0a2..482ba70 100644
--- a/src/app/pages/infra/infra-page.module.ts
+++ b/src/app/pages/infra/infra-page.module.ts
@@ -5,6 +5,7 @@ import { InfraPageRoutingModule } from './infra-page-routing.module';
 
 import { InfraModule } from '@overflow/infra/infra.module';
 import { InfraPageComponent } from './infra-page.component';
+import { KeyValueModule } from '../../commons/component/key-value/key-value.module';
 // import { DiscoveryModule } from '@overflow/discovery/discovery.module';
 
 @NgModule({
@@ -12,6 +13,7 @@ import { InfraPageComponent } from './infra-page.component';
     CommonModule,
     InfraPageRoutingModule,
     InfraModule,
+    KeyValueModule
     // DiscoveryModule
   ],
   declarations: [
diff --git a/src/app/pages/probes/probe-tab-page.module.ts b/src/app/pages/probes/probe-tab-page.module.ts
index 9395eb3..d19271d 100644
--- a/src/app/pages/probes/probe-tab-page.module.ts
+++ b/src/app/pages/probes/probe-tab-page.module.ts
@@ -6,6 +6,7 @@ import { ProbeTabPageRoutingModule } from './probe-tab-page-routing.module';
 import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
 import { ProbeModule } from '@overflow/probe/probe.module';
 import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.module';
+import { KeyValueModule } from '../../commons/component/key-value/key-value.module';
 
 @NgModule({
   imports: [
@@ -14,6 +15,7 @@ import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.m
     PrimeNGModules,
     ProbeModule,
     TabbarModule,
+    KeyValueModule
   ],
   declarations: [
     ProbeTabPageComponent,