diff --git a/@overflow/discovery/component/discovery/service-selector/service-selector.component.ts b/@overflow/discovery/component/discovery/service-selector/service-selector.component.ts
index ea86fa4..484570c 100644
--- a/@overflow/discovery/component/discovery/service-selector/service-selector.component.ts
+++ b/@overflow/discovery/component/discovery/service-selector/service-selector.component.ts
@@ -9,8 +9,6 @@ import {
 } from '@angular/core';
 import { Store, select, StateObservable } from '@ngrx/store';
 import { RPCClientError } from '@loafer/ng-rpc';
-import * as ListStore from '@overflow/meta/crawler/store/list';
-import { ReadAllCrawlerSelector } from '@overflow/meta/crawler/store';
 import { MetaCrawler } from '@overflow/commons-typescript/model/meta';
 import { Subscription } from 'rxjs/Subscription';
 
@@ -27,7 +25,7 @@ export class ServiceSelectorComponent implements OnInit, AfterContentInit, OnDes
   @Input() includeServices;
 
   constructor(
-    private listStore: Store<ListStore.State>,
+    private listStore: Store<any>,
   ) {
     // this.crawlers$ = listStore.pipe(select(ReadAllCrawlerSelector.select('metaCrawlerList')));
   }
diff --git a/@overflow/discovery/discovery.module.ts b/@overflow/discovery/discovery.module.ts
index 3063c2e..e3ed636 100644
--- a/@overflow/discovery/discovery.module.ts
+++ b/@overflow/discovery/discovery.module.ts
@@ -8,10 +8,12 @@ import { DiscoveryLoggerModule } from './discovery-logger.module';
 
 import { COMPONENTS } from './component';
 import { SERVICES } from './service';
+import { CONTAINER_COMPONENTS } from './container';
+
 import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
 import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.module';
-import { CONTAINER_COMPONENTS } from './container';
-import { ProbeModule } from '../probe/probe.module';
+import { ProbeModule } from '@overflow/probe/probe.module';
+import { MetaModule } from '@overflow/meta/meta.module';
 
 @NgModule({
   imports: [
@@ -23,7 +25,8 @@ import { ProbeModule } from '../probe/probe.module';
     DiscoveryRPCModule,
     DiscoveryLoggerModule,
     KeyValueModule,
-    ProbeModule
+    ProbeModule,
+    MetaModule
   ],
   declarations: [
     COMPONENTS,
diff --git a/@overflow/infra/infra.module.ts b/@overflow/infra/infra.module.ts
index 577bb86..465b3a9 100644
--- a/@overflow/infra/infra.module.ts
+++ b/@overflow/infra/infra.module.ts
@@ -8,7 +8,7 @@ import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
 import { DiscoveryModule } from '@overflow/discovery/discovery.module';
 import { SensorModule } from '@overflow/sensor/sensor.module';
 import { ProbeModule } from '@overflow/probe/probe.module';
-import { MetaCrawlerModule } from '@overflow/meta/crawler/crawler.module';
+import { MetaModule } from '@overflow/meta/meta.module';
 import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.module';
 
 
@@ -22,7 +22,7 @@ import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.
     SensorModule,
     KeyValueModule,
     ProbeModule,
-    MetaCrawlerModule
+    MetaModule,
   ],
   declarations: [
     COMPONENTS,
diff --git a/@overflow/probe/probe.module.ts b/@overflow/probe/probe.module.ts
index 333e0c2..6822bc9 100644
--- a/@overflow/probe/probe.module.ts
+++ b/@overflow/probe/probe.module.ts
@@ -7,7 +7,7 @@ import { ProbeStoreModule } from './probe-store.module';
 import { SERVICES } from './service';
 import { PrimeNGModules } from '../commons/prime-ng/prime-ng.module';
 import { FormsModule } from '@angular/forms';
-import { MetaCrawlerModule } from '@overflow/meta/crawler/crawler.module';
+import { MetaModule } from '@overflow/meta/meta.module';
 import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.module';
 
 @NgModule({
@@ -17,7 +17,7 @@ import { KeyValueModule } from '@overflow/commons/component/key-value/key-value.
     ProbeStoreModule,
     FormsModule,
     KeyValueModule,
-    MetaCrawlerModule
+    MetaModule
   ],
   declarations: [
     CONTAINER_COMPONENTS,