diff --git a/.gitmodules b/.gitmodules
index f203b76..dab245a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -46,3 +46,9 @@
 [submodule "graph"]
 	path = graph
 	url = https://github.com/open-falcon/graph.git
+[submodule "nodata"]
+	path = nodata
+	url = https://github.com/open-falcon/nodata.git
+[submodule "aggregator"]
+	path = aggregator
+	url = https://github.com/open-falcon/aggregator.git
diff --git a/README.md b/README.md
index 2ae80c2..fd3fe2f 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 # Wiki
 
-- http://open-falcon.com
+http://open-falcon.com
 
 
 # License
 
+Licensed under the Apache License, Version 2.0: http://www.apache.org/licenses/LICENSE-2.0
+
 Copyright 2014-2015 Xiaomi, Inc.
-Licensed under the Apache License,
-Version 2.0:
-http://www.apache.org/licenses/LICENSE-2.0
+
+Copyright 2016 open-falcon.org
diff --git a/agent b/agent
index 9cce732..a82ace6 160000
--- a/agent
+++ b/agent
@@ -1 +1 @@
-Subproject commit 9cce7320c86fa3324a99f1923675a69663483a8f
+Subproject commit a82ace6734e2751f8ac8d611b261b2251dbe0c18
diff --git a/aggregator b/aggregator
new file mode 160000
index 0000000..03e209c
--- /dev/null
+++ b/aggregator
@@ -0,0 +1 @@
+Subproject commit 03e209c693429a900d37b1f0a199039aa866dd33
diff --git a/alarm b/alarm
index 8b568ce..0fac99d 160000
--- a/alarm
+++ b/alarm
@@ -1 +1 @@
-Subproject commit 8b568ceaa381ed409b7037a45947e5fddea2f41c
+Subproject commit 0fac99d57f5dd957e2b09e4c2b181e2180d4b950
diff --git a/common b/common
index 90353af..b6dbd8f 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 90353af2020b999010d5448ee553778c1c98dbb9
+Subproject commit b6dbd8f707b94dd68a63c4d9dfad7aa6f6355dba
diff --git a/dashboard b/dashboard
index d25adaf..35dbee7 160000
--- a/dashboard
+++ b/dashboard
@@ -1 +1 @@
-Subproject commit d25adaf5a7f0c994034c6d99b7b9091ac3261a0a
+Subproject commit 35dbee7bc06d294a32ecba18a62395e320dcfb8a
diff --git a/fe b/fe
index 0386f4e..96a6838 160000
--- a/fe
+++ b/fe
@@ -1 +1 @@
-Subproject commit 0386f4e58da08994931d50a910521e9004ab4dd4
+Subproject commit 96a683823d95f6d8a98873f86475f9d4620d288d
diff --git a/gateway b/gateway
index 90096b2..7a9fb56 160000
--- a/gateway
+++ b/gateway
@@ -1 +1 @@
-Subproject commit 90096b284f14cf90b1628e5b222d9b2f98dc62df
+Subproject commit 7a9fb5699ac7309bb90188c4ae52fcf27923c34a
diff --git a/graph b/graph
index 5728922..07fb9e6 160000
--- a/graph
+++ b/graph
@@ -1 +1 @@
-Subproject commit 5728922e0dbb03f51afdf8314036ae210b5c7c9a
+Subproject commit 07fb9e6bb97742e4c8dc664c06978d989de6aa71
diff --git a/hbs b/hbs
index 747de7e..55b8a35 160000
--- a/hbs
+++ b/hbs
@@ -1 +1 @@
-Subproject commit 747de7e5b854538e327b72015658363985150986
+Subproject commit 55b8a3591b673a2f263ce74ce2440ed3fbffd0c8
diff --git a/nodata b/nodata
new file mode 160000
index 0000000..57ca211
--- /dev/null
+++ b/nodata
@@ -0,0 +1 @@
+Subproject commit 57ca211a5002f31b94abad3152d0f10a7d197576
diff --git a/portal b/portal
index 5e3c906..1c8d04d 160000
--- a/portal
+++ b/portal
@@ -1 +1 @@
-Subproject commit 5e3c90623192c785dfd7c40c97a21ccf3fb8e1b8
+Subproject commit 1c8d04d90b432a75b8f556859cc5967484e58cdc
diff --git a/query b/query
index 923f80c..ea558f8 160000
--- a/query
+++ b/query
@@ -1 +1 @@
-Subproject commit 923f80c43ebd133ab84e12a8606b34f74d428383
+Subproject commit ea558f892821ff9ecb0d858dea8176e1db7b5b78
diff --git a/scripts b/scripts
index 3014fd9..8445e00 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3014fd9173a62598da4ec95329134fb5aad8c215
+Subproject commit 8445e00cf286606e10fd2002d8761ef30b38ecec
diff --git a/task b/task
index b4d6264..72ff809 160000
--- a/task
+++ b/task
@@ -1 +1 @@
-Subproject commit b4d62644d410feed0d9aaefa590206f1da805c30
+Subproject commit 72ff8090fbe2661c914d191474426c8918fc4196
diff --git a/transfer b/transfer
index 190a7eb..dd263b4 160000
--- a/transfer
+++ b/transfer
@@ -1 +1 @@
-Subproject commit 190a7ebb8e1f17070a603ec33fe10069a4cea542
+Subproject commit dd263b4d2f91a733dfc16ddd4d1d484152f0f634