diff --git a/layers/waterway/mapping.yaml b/layers/waterway/mapping.yaml
index dadf9e3b..c4e4ba00 100644
--- a/layers/waterway/mapping.yaml
+++ b/layers/waterway/mapping.yaml
@@ -1,3 +1,12 @@
+generalized_tables:
+  waterway_linestring_gen0:
+    source: waterway_linestring_gen1
+    sql_filter: waterway IN ('river') AND ST_Length(geometry) > 10000
+    tolerance: 200.0
+  waterway_linestring_gen1:
+    source: waterway_linestring
+    sql_filter: waterway IN ('river') AND ST_Length(geometry) > 5000
+    tolerance: 100.0
 tables:
   waterway_linestring:
     type: linestring
diff --git a/layers/waterway/waterway.sql b/layers/waterway/waterway.sql
index 79e75d0c..9d0b9cfc 100644
--- a/layers/waterway/waterway.sql
+++ b/layers/waterway/waterway.sql
@@ -13,17 +13,15 @@ CREATE OR REPLACE VIEW waterway_z6 AS (
     WHERE featurecla = 'River'
 );
 
-CREATE TABLE IF NOT EXISTS waterway_z8 AS (
-    SELECT ST_Simplify(geometry, 200) AS geom, waterway AS class FROM osm_waterway_linestring
+CREATE OR REPLACE VIEW waterway_z8 AS (
+    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river') AND ST_Length(geometry) > 10000
 );
-CREATE INDEX IF NOT EXISTS waterway_z8_geom_idx ON waterway_z8 USING gist(geom);
 
-CREATE TABLE IF NOT EXISTS waterway_z9 AS (
-    SELECT ST_Simplify(geometry, 100) AS geom, waterway AS class FROM osm_waterway_linestring
+CREATE OR REPLACE VIEW waterway_z9 AS (
+    SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring
     WHERE waterway IN ('river') AND ST_Length(geometry) > 5000
 );
-CREATE INDEX IF NOT EXISTS waterway_z9_geom_idx ON waterway_z9 USING gist(geom);
 
 CREATE OR REPLACE VIEW waterway_z11 AS (
     SELECT geometry AS geom, waterway AS class FROM osm_waterway_linestring