diff --git a/CHANGES.md b/CHANGES.md
index 362dead31..ac41e857b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,19 +1,81 @@
  Changes by Version
  ==================
  Release Notes.
+  
+ 5.0.0-beta
+ ------------------
+ 
+#### UI -> Collector GraphQL query protocol
+  - Replace all tps to throughtput/cpm(calls per min)
+  - Add `getThermodynamic` service
+  - Update version to beta
+ 
+#### Agent Changes
+  - Support TLS.
+  - Support namespace.
+  - Support direct link.
+  - Support token.
+  - Add across thread toolkit.
+  - Add new plugin extend machenism to override agent core implementations.
+  - Fix an agent start up sequence bug.
+  - Fix wrong gc count.
+  - Remove system env override.
+  - Add Spring AOP aspect patch to avoid aop conflicts.
+ 
+#### Collector Changes
+  - Trace query based on timeline.
+  - Delete JVM aggregation in second.
+  - Support TLS.
+  - Support namespace.
+  - Support token auth.
+  - Group and aggregate requests based on reponse time and timeline, support Thermodynamic chart query
+  - Support component librariy setting through yml file for better extendibility.
+  - Optimize performance.
+  - Support short column name in ES or other storage implementor.
+  - Add a new cache module implementor, based on **Caffeine**.
+  - Support system property override settings.
+  - Refactor settings initialization.
+  - Provide collector instrumentation agent.
+  - Support .NET core component libraries.
+  - Fix `divide zero` in query.
+  - Fix `Data don't remove as expected` in ES implementor.
+  - Add some checks in collector modulization core.
+  - Add some test cases.
+ 
+#### UI Changes
+  - New trace query UI.
+  - New Application UI, merge server tab(removed) into applciation as sub page.
+  - New Topology UI.
+  - New response time / throughput TopN list.
+  - Add Thermodynamic chart in overview page.
+  - Change all tps to cpm(calls per minutes).
+  - Fix wrong osName in server view.
+  - Fix wrong startTime in trace view.
+  - Fix some icons internet requirements.
+ 
+ #### Documents
+   - Add TLS document.
+   - Add namespace document.
+   - Add direct link document.
+   - Add token document.
+   - Add across thread toolkit document.
+   - Add a FAQ about, `Agent or collector version upgrade`.
+   - Sync all English document to Chinese.
+ 
+  [Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/24)
  
  5.0.0-alpha
  ------------------
  
- #### Agent -> Collector protocol
+#### Agent -> Collector protocol
  - Remove C++ keywords
  - Move **Ref** into Span from Segment
  - Add span type, when register an operation
 
- #### UI -> Collector GraphQL query protocol
+#### UI -> Collector GraphQL query protocol
  - First version protocol
  
- #### Agent Changes
+#### Agent Changes
  - Support gRPC 1.x plugin
  - Support kafka 0.11 and 1.x plugin
  - Support ServiceComb 0.x plugin
@@ -27,14 +89,14 @@
  - Fix log config didn't work
  - Fix a class loader error in okhttp plugin
  
- #### Collector Changes
+#### Collector Changes
  - Support metrics analysis and aggregation for application, application instance and service in minute, hour, day and month.
  - Support new GraphQL query protocol
  - Support alarm
  - Provide a prototype instrument for collector.
  - Support node speculate in cluster and application topology. (Provider Node -> Consumer Node) -> (Provider Node -> MQ Server -> Consumer Node)
  
- #### UI Changes
+#### UI Changes
  - New 5.0.0 UI!!!
  
  [Issues and Pull requests](https://github.com/apache/incubator-skywalking/milestone/17)
diff --git a/docs/ROADMAP.md b/docs/ROADMAP.md
index b3ad0b355..1e9e48011 100644
--- a/docs/ROADMAP.md
+++ b/docs/ROADMAP.md
@@ -18,12 +18,9 @@ Core features are separated into 3 groups: agent, collector and UI.
 - Continue DB/Cache access span merged automatically.
 
 ### Collector
-- Multi-Tenancy
-- Config alarm thresholds.
-- Config data TTL.
 - Support config data downstream to agent. Need adjust TDP(Trace Data Protocol)
 - Support server metrics of other languages, such as C#. Need adjust TDP(Trace Data Protocol)
-- Alarm notification. Default through mail.
+- Alarm notification. 
 - Baseline calculation, to make the alarm more accuracy.
 - Performance optimization (Stream metric aggregate and query for UI)
 - Automated testing (Stream metric aggregate and query for UI)
@@ -40,7 +37,6 @@ Core features are separated into 3 groups: agent, collector and UI.
 ## Community features
 Community features are reported from SkyWalking community or the core team hopes community contributors provide the implementations.
 
-- C# agent.
 - Golang SDK as OpenCensus Reporter.
 - Support Sharding-JDBC as Collector storage implementor.
 - Support connect ES under auth, in Collector.
@@ -52,7 +48,7 @@ Community features are reported from SkyWalking community or the core team hopes
 - [Java]Specific service profile
 
 ## Project release plan
-1. Mar. 2018, 5.0.0-alpha
-1. Apr. 2018, 5.0.0-beta
-1. May. 2018, 5.0.0-RC
-1. Jun. 2018, 5.0.0(GA)
+1. May. 2018, 5.0.0-beta
+1. Jun. 2018, 5.0.0-beta2
+1. Jul. 2018, 5.0.0-RC
+1. Jul. 2018, 5.0.0(GA)