diff --git a/CHANGELOG.md b/CHANGELOG.md
index b9d2be35..e815646c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2.7.0 
+### Added
+* Endpoints tree view
+* Monitor custom Event Hub endpoint
+
+### Changed
+* Rename 'Start Monitoring D2C Message' to 'Start Monitoring Built-in Event Endpoint'
+
 ## 2.6.0 (2019-04-23)
 ### Added
 * Show properties when monitoring C2D message
diff --git a/README.md b/README.md
index bb0d6081..5fd8b714 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ The [Wiki page](https://github.com/Microsoft/vscode-azure-iot-toolkit/wiki) incl
     * Delete device
     * Copy Device Connection String
     * Generate SAS Token for Device
-* Module management
+* Module Endpoint
     * List Modules
     * Get Module Info
     * Create Module
@@ -31,7 +31,7 @@ The [Wiki page](https://github.com/Microsoft/vscode-azure-iot-toolkit/wiki) incl
 * Interact with Azure IoT Hub
     * Generate Code for C#, F#, Go, Java, Node.js, PHP, Python, Ruby or REST API
     * Send D2C message to IoT Hub
-    * Monitor IoT Hub D2C message
+    * Monitor Built-in Event Endpoint
     * Send C2D message to device
     * Monitor C2D message from IoT Hub
     * Invoke Device Direct Method
@@ -42,6 +42,9 @@ The [Wiki page](https://github.com/Microsoft/vscode-azure-iot-toolkit/wiki) incl
     * Edit Module Twin
     * Create deployment for Single Device
     * Create Deployment at Scale
+* Endpoints Endpoint
+    * List Built-in and Custom Endpoints
+    * Monitor Custom Event Hub Endpoint
 
 ### Prerequisites
 
diff --git a/package.json b/package.json
index ecb2d4e8..c7f52493 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "azure-iot-toolkit",
   "displayName": "Azure IoT Hub Toolkit",
   "description": "Interact with Azure IoT Hub, IoT Device Management, IoT Edge Management, IoT Hub Device Simulation, IoT Hub Code Generation",
-  "version": "2.6.0",
+  "version": "2.7.0-rc",
   "publisher": "vsciot-vscode",
   "aiKey": "0caaff90-cc1c-4def-b64c-3ef33615bc9b",
   "icon": "logo.png",