diff --git a/layers/landuse/landuse.sql b/layers/landuse/landuse.sql
index a1cae13..f7c4285 100644
--- a/layers/landuse/landuse.sql
+++ b/layers/landuse/landuse.sql
@@ -159,7 +159,8 @@ SELECT osm_id,
                NULLIF(leisure, ''),
                NULLIF(tourism, ''),
                NULLIF(place, ''),
-               NULLIF(waterway, '')
+               NULLIF(waterway, ''),
+               NULLIF(man_made, ''),
            ) AS class
 FROM (
          -- etldoc: landuse_z4 -> layer_landuse:z4
diff --git a/layers/landuse/mapping.yaml b/layers/landuse/mapping.yaml
index 6f72b43..d3f2129 100644
--- a/layers/landuse/mapping.yaml
+++ b/layers/landuse/mapping.yaml
@@ -75,6 +75,7 @@ tables:
       - garages
       - retail
       - religious
+      - construction
       amenity:
       - bus_station
       - school
diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index 152aa46..6b2cf6b 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -77,6 +77,8 @@ def_poi_mapping_barrier: &poi_mapping_barrier
 # building values , see http://taginfo.openstreetmap.org/keys/building#values
 def_poi_mapping_building: &poi_mapping_building
   - dormitory
+  - office
+  - industrial
 
 # highway values , see http://taginfo.openstreetmap.org/keys/highway#values
 def_poi_mapping_highway: &poi_mapping_highway
diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml
index 607306a..03d268e 100644
--- a/layers/poi/poi.yaml
+++ b/layers/poi/poi.yaml
@@ -18,18 +18,25 @@ layer:
       values:
         shop:
           subclass: ['accessories', 'antiques', 'beauty', 'bed', 'boutique', 'camera', 'carpet', 'charity', 'chemist',
-                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics', 'doityourself',
+                     'coffee', 'computer', 'convenience', 'copyshop', 'cosmetics',
                      'erotic', 'fabric', 'frozen_food', 'video_games', 'video', 'general', 'gift',
-                     'hearing_aids', 'hifi', 'interior_decoration', 'kiosk', 'lamps', 'mall', 'massage', 'motorcycle',
-                     'newsagent', 'outdoor', 'perfumery', 'perfume', 'pet', 'photo',
-                     'second_hand', 'sports', 'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys',
-                     'travel_agency', 'watches', 'weapons', 'wholesale']
+                     'hearing_aids', 'hifi', 'interior_decoration', 'kiosk', 'lamps', 'mall', 'massage','outdoor',
+                     'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 'sports', 'stationery', 'tailor', 'tattoo',
+                     'ticket', 'tobacco', 'travel_agency', 'watches', 'weapons', 'wholesale']
         optician:
-            subclass: ['optician']
+          subclass: ['optician']
+        toys:
+          subclass: ['toys']
         jewelry:
           subclass: ['jewelry']
         furniture:
           subclass: ['furniture']
+        newsagent:
+          subclass: ['newsagent']
+        paint:
+          subclass: ['paint']
+        beverages:
+          subclass: ['beverages']
         electronics:
           subclass: ['electronics']
         garden_centre:
@@ -39,7 +46,7 @@ layer:
         shoes:
           subclass: ['shoes']
         hardware:
-          subclass: ['hardware']
+          subclass: ['hardware', 'doityourself']
         florist:
           subclass: ['florist']
         town_hall:
@@ -91,6 +98,8 @@ layer:
           subclass: ['marina', 'dock']
         taxi:
           subclass: ['taxi']
+        motorcycle_dealer:
+          subclass: ['motorcycle']
         car_dealer:
           subclass: ['car', 'car_parts']
         car_repair:
diff --git a/test.sh b/test.sh
new file mode 100644
index 0000000..466c1b9
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -e
+
+# Test script for generating tiles for Lummen and region (e.g. including Hasselt)
+export SOURCE=osmfr
+export AREA=europe/belgium/flanders
+export BBOX=4.964926,50.882471,5.411252,51.071236
+# Which zooms to generate in   make generate-tiles
+export MIN_ZOOM=0
+export MAX_ZOOM=16
+
+# Update the .env to match
+sed -i "s/MIN_ZOOM=.*/MIN_ZOOM=${MIN_ZOOM}/" .env
+sed -i "s/MAX_ZOOM=.*/MAX_ZOOM=${MAX_ZOOM}/" .env
+sed -i "s/BBOX=.*/BBOX=${BBOX}/" .env
+
+
+# Setup
+make clean
+make DC_OPTS=--rm
+
+# Start from a clean db
+make start-db
+make destroy-db
+make import-data
+# ALTERNATIVE would be this
+#make start-db-preloaded
+
+# Download
+make download-${SOURCE} area="${AREA}"
+
+# Import
+make import-osm
+make import-borders
+make import-wikidata
+make import-sql
+make analyze-db
+
+# (This potentially screws stuff up?!)
+#rm -rf data/${AREA}.dc-config.yml
+#make generate-dc-config
+
+# Generate
+make generate-tiles
+
+make stop-db
\ No newline at end of file