diff --git a/data.yml b/data.yml
index 6f0c0759..0d6d9fb6 100644
--- a/data.yml
+++ b/data.yml
@@ -134,7 +134,21 @@ Layer:
             UNION ALL
             SELECT * FROM road_z6 WHERE z(!scale_denominator!) = 6
             UNION ALL
-            SELECT * FROM road_z7 WHERE z(!scale_denominator!) >= 7
+            SELECT * FROM road_z7 WHERE z(!scale_denominator!) = 7
+            UNION ALL
+            SELECT * FROM road_z8 WHERE z(!scale_denominator!) = 8
+            UNION ALL
+            SELECT ST_Simplify(geom, 200), class FROM road_z9 WHERE z(!scale_denominator!) = 9
+            UNION ALL
+            SELECT ST_Simplify(geom, 120), class FROM road_z10 WHERE z(!scale_denominator!) = 10
+            UNION ALL
+            SELECT ST_Simplify(geom, 50), class FROM road_z11 WHERE z(!scale_denominator!) = 11
+            UNION ALL
+            SELECT ST_Simplify(geom, 20), class FROM road_z12 WHERE z(!scale_denominator!) = 12
+            UNION ALL
+            SELECT * FROM road_z13 WHERE z(!scale_denominator!) = 13
+            UNION ALL
+            SELECT * FROM road_z14 WHERE z(!scale_denominator!) >= 14
           ) AS road
           WHERE geom && !bbox!
         ) AS data
@@ -143,7 +157,6 @@ Layer:
     description: Buildings
     fields: 
       class: String
-      scalerank: Number
     properties: 
       "buffer-size": 4
     srs: +proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0.0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs +over
diff --git a/schema/layers/road.sql b/schema/layers/road.sql
index 48d75e8c..0ea5294a 100644
--- a/schema/layers/road.sql
+++ b/schema/layers/road.sql
@@ -20,25 +20,66 @@ CREATE OR REPLACE VIEW ne_10m_global_roads AS (
 );
 
 CREATE OR REPLACE VIEW road_z4 AS (
-    SELECT *
+    SELECT geom, class
     FROM ne_10m_global_roads
     WHERE scalerank <= 5
 );
 
 CREATE OR REPLACE VIEW road_z5 AS (
-    SELECT *
+    SELECT geom, class
     FROM ne_10m_global_roads
     WHERE scalerank <= 6
 );
 
 CREATE OR REPLACE VIEW road_z6 AS (
-    SELECT *
+    SELECT geom, class
     FROM ne_10m_global_roads
     WHERE scalerank <= 7
 );
 
 CREATE OR REPLACE VIEW road_z7 AS (
-    SELECT *
+    SELECT geom, class
     FROM ne_10m_global_roads
     WHERE scalerank <= 7
 );
+
+CREATE OR REPLACE VIEW road_z8 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class IN ('motorway','trunk')
+);
+
+CREATE OR REPLACE VIEW road_z9 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class IN ('motorway','trunk', 'primary')
+);
+
+CREATE OR REPLACE VIEW road_z10 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class IN ('motorway','trunk', 'primary', 'secondary')
+);
+
+CREATE OR REPLACE VIEW road_z11 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class IN ('motorway','trunk', 'primary', 'secondary', 'tertiary')
+);
+
+CREATE OR REPLACE VIEW road_z12 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class IN ('motorway','trunk','primary', 'secondary', 'tertiary', 'minor')
+);
+
+CREATE OR REPLACE VIEW road_z13 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+    WHERE class NOT IN ('path')
+);
+
+CREATE OR REPLACE VIEW road_z14 AS (
+    SELECT way AS geom, class::text
+    FROM roads
+);