diff --git a/trunk/conf/demo.19350.conf b/trunk/conf/demo.19350.conf
index e85579c7e..7b9b9ba3b 100644
--- a/trunk/conf/demo.19350.conf
+++ b/trunk/conf/demo.19350.conf
@@ -11,7 +11,9 @@ pid                 ./objs/srs.demo.19350.pid;
 
 vhost __defaultVhost__ {
     enabled         on;
-    gop_cache       on;
+    play {
+        gop_cache       on;
+    }
     hls {
         enabled         on;
         hls_path        ./objs/nginx/html/forward;
diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf
index 93fa3b616..76dc1ec1d 100644
--- a/trunk/conf/full.conf
+++ b/trunk/conf/full.conf
@@ -445,17 +445,19 @@ vhost play.srs.com {
 # vhost for time jitter
 vhost jitter.srs.com {
     # @see play.srs.com
-    time_jitter             full;
-    # @see play.srs.com
-    mix_correct             off;
+    play {
+        time_jitter             full;
+        mix_correct             off;
+    }
 }
 
 # vhost for atc.
 vhost atc.srs.com {
     # @see play.srs.com
-    atc             on;
-    # @see play.srs.com
-    atc_auto        on;
+    play {
+        atc             on;
+        atc_auto        on;
+    }
 }
 
 # the MR(merged-read) setting for publisher.
diff --git a/trunk/conf/http.flv.live.edge1.conf b/trunk/conf/http.flv.live.edge1.conf
index a9000d25f..fe8b1b24d 100644
--- a/trunk/conf/http.flv.live.edge1.conf
+++ b/trunk/conf/http.flv.live.edge1.conf
@@ -12,8 +12,10 @@ http_server {
     dir             ./objs/nginx/html;
 }
 vhost __defaultVhost__ {
-    mode remote;
-    origin 127.0.0.1;
+    cluster {
+        mode remote;
+        origin 127.0.0.1;
+    }
     http_remux {
         enabled     on;
         mount       [vhost]/[app]/[stream].flv;
diff --git a/trunk/conf/http.flv.live.edge2.conf b/trunk/conf/http.flv.live.edge2.conf
index 98c877b90..66b15cd8b 100644
--- a/trunk/conf/http.flv.live.edge2.conf
+++ b/trunk/conf/http.flv.live.edge2.conf
@@ -12,8 +12,10 @@ http_server {
     dir             ./objs/nginx/html;
 }
 vhost __defaultVhost__ {
-    mode remote;
-    origin 127.0.0.1;
+    cluster {
+        mode remote;
+        origin 127.0.0.1;
+    }
     http_remux {
         enabled     on;
         mount       [vhost]/[app]/[stream].flv;
diff --git a/trunk/conf/http.server.conf b/trunk/conf/http.server.conf
index 69c94f39c..e424b9fc7 100644
--- a/trunk/conf/http.server.conf
+++ b/trunk/conf/http.server.conf
@@ -9,7 +9,7 @@ http_server {
     dir             ./objs/nginx/html;
 }
 vhost ossrs.net {
-    http {
+    http_static {
         enabled     on;
         mount       [vhost]/;
         dir         ./objs/nginx/html;
diff --git a/trunk/conf/transform.edge.conf b/trunk/conf/transform.edge.conf
index 964c796dd..09b35b2ed 100644
--- a/trunk/conf/transform.edge.conf
+++ b/trunk/conf/transform.edge.conf
@@ -21,7 +21,9 @@ vhost source.srs.com {
     }
 }
 vhost transform.srs.edge.com {
-    mode            remote;
-    origin          127.0.0.1:1935;
-    vhost           source.srs.com;
+    cluster {
+        mode            remote;
+        origin          127.0.0.1:1935;
+        vhost           source.srs.com;
+    }
 }
\ No newline at end of file