diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
index 24ad89baeca0e6cdf5cec35ef1e52726cd91f6e6..91688271efe2cf3ae7ca621a02fdfe0ab97ca701 100644
--- a/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
+++ b/apm-collector/apm-collector-alerting/collector-alerting-provider/pom.xml
@@ -31,6 +31,11 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-alerting-define</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.skywalking</groupId>
             <artifactId>collector-agent-stream-define</artifactId>
diff --git a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java b/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
index 9eaccab1800ce54d8edf9ae3edb0c4f1a34576fc..b5ab73e8709f7249430282db9aa8790049a5bdd4 100644
--- a/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
+++ b/apm-collector/apm-collector-alerting/collector-alerting-provider/src/main/java/org/skywalking/apm/collector/alerting/AlertingModuleProvider.java
@@ -34,7 +34,7 @@ public class AlertingModuleProvider extends ModuleProvider {
     }
 
     @Override public Class<? extends Module> module() {
-        return null;
+        return AlertingModule.class;
     }
 
     @Override public void prepare(Properties config) throws ServiceNotProvidedException {
diff --git a/apm-collector/apm-collector-boot/pom.xml b/apm-collector/apm-collector-boot/pom.xml
index caec74d408020815374b879ba989e398064e5288..df8ceb3c8ad90c78dd3bd35541c51bd6d0498f74 100644
--- a/apm-collector/apm-collector-boot/pom.xml
+++ b/apm-collector/apm-collector-boot/pom.xml
@@ -150,6 +150,20 @@
             <version>${project.version}</version>
         </dependency>
         <!-- cache provider -->
+        <!-- configuration provider -->
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-configuration-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- configuration provider -->
+        <!-- alerting provider -->
+        <dependency>
+            <groupId>org.skywalking</groupId>
+            <artifactId>collector-alerting-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- alerting provider -->
     </dependencies>
 
     <build>
diff --git a/apm-collector/apm-collector-core/src/main/resources/application-default.yml b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
index 4ecad1dbb933f64544313b04b6c3e0911b045b7f..0c767ff5c8c635538d775ade15a23fd612baebed 100644
--- a/apm-collector/apm-collector-core/src/main/resources/application-default.yml
+++ b/apm-collector/apm-collector-core/src/main/resources/application-default.yml
@@ -31,6 +31,8 @@ agent_stream:
     buffer_segment_max_file_size: 500M
 configuration:
   default:
+alerting:
+  default:
 ui:
   jetty:
     host: localhost
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
similarity index 92%
rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
index 3323a5b47cdb8f5392082015d9f8d2ae65e176f7..91d1b98deef6feeb808cdbc99ce46934f6d00df7 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationComponentEsTableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationCompone
 /**
  * @author peng-yongsheng
  */
-public class NodeComponentEsTableDefine extends ElasticSearchTableDefine {
+public class ApplicationComponentEsTableDefine extends ElasticSearchTableDefine {
 
-    public NodeComponentEsTableDefine() {
+    public ApplicationComponentEsTableDefine() {
         super(ApplicationComponentTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
similarity index 92%
rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
index a56a54f5182b213da14eb4ea49be2b9a4dc7adb2..c446a913f0e825ee63262afaa8b4c0e4e5cf366b 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationMappingEsTableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationMapping
 /**
  * @author peng-yongsheng
  */
-public class NodeMappingEsTableDefine extends ElasticSearchTableDefine {
+public class ApplicationMappingEsTableDefine extends ElasticSearchTableDefine {
 
-    public NodeMappingEsTableDefine() {
+    public ApplicationMappingEsTableDefine() {
         super(ApplicationMappingTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
index 539421a58b3041191ee8ecb3ba1f312213faf809..00be075e88804591647d046f76eadf3e091305c0 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define
@@ -7,9 +7,9 @@ org.skywalking.apm.collector.storage.es.define.MemoryMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.MemoryPoolMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.GlobalTraceEsTableDefine
 org.skywalking.apm.collector.storage.es.define.InstPerformanceEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeComponentEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeMappingEsTableDefine
-org.skywalking.apm.collector.storage.es.define.NodeReferenceEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationComponentEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationMappingEsTableDefine
+org.skywalking.apm.collector.storage.es.define.ApplicationReferenceMetricEsTableDefine
 org.skywalking.apm.collector.storage.es.define.SegmentCostEsTableDefine
 org.skywalking.apm.collector.storage.es.define.SegmentEsTableDefine
 org.skywalking.apm.collector.storage.es.define.ServiceEntryEsTableDefine
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
similarity index 93%
rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
index 1c50caafd0db4396dfa440f4883a646e0f6187cf..c1ec446b1a413145847313c92510da4a5cf00cf7 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationComponentH2TableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationCompone
 /**
  * @author peng-yongsheng
  */
-public class NodeComponentH2TableDefine extends H2TableDefine {
+public class ApplicationComponentH2TableDefine extends H2TableDefine {
 
-    public NodeComponentH2TableDefine() {
+    public ApplicationComponentH2TableDefine() {
         super(ApplicationComponentTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
similarity index 93%
rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java
rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
index 06feef8b3eb61e64c7fa3bdc6d6fd17a75e2b935..7568c0c3cb5ebb60f71ead1d1da5a93ddcfb977f 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationMappingH2TableDefine.java
@@ -25,9 +25,9 @@ import org.skywalking.apm.collector.storage.table.application.ApplicationMapping
 /**
  * @author peng-yongsheng
  */
-public class NodeMappingH2TableDefine extends H2TableDefine {
+public class ApplicationMappingH2TableDefine extends H2TableDefine {
 
-    public NodeMappingH2TableDefine() {
+    public ApplicationMappingH2TableDefine() {
         super(ApplicationMappingTable.TABLE);
     }
 
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
index da36dc97fd4842ac198383c4c88139e196decbec..339e10e1892e2715154014971ed336ed2b56a4a3 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define
@@ -7,9 +7,9 @@ org.skywalking.apm.collector.storage.h2.define.MemoryMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.MemoryPoolMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.GlobalTraceH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.InstPerformanceH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeComponentH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeMappingH2TableDefine
-org.skywalking.apm.collector.storage.h2.define.NodeReferenceH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationComponentH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationMappingH2TableDefine
+org.skywalking.apm.collector.storage.h2.define.ApplicationReferenceMetricH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.SegmentCostH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.SegmentH2TableDefine
 org.skywalking.apm.collector.storage.h2.define.ServiceEntryH2TableDefine