diff --git a/layers/transportation/transportation.yaml b/layers/transportation/transportation.yaml
index 12f64f3e..c6a47dc7 100644
--- a/layers/transportation/transportation.yaml
+++ b/layers/transportation/transportation.yaml
@@ -1,7 +1,7 @@
 layer:
   id: "transportation"
   description: |
-      Roads or [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) in OpenStreetMap lingo.
+      **transportation** containsrRoads and railways.
       This layer is directly derived from the OSM road hierarchy which is why it is called `highway`. Only
       at zoom level 4 to 7 some major highways from Natural Earth are used otherwise it is only OSM data.
       It contains all roads from motorways to primary, secondary and tertiary roads to residential roads and
@@ -15,17 +15,87 @@ layer:
   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
   fields:
-    class: |
-        Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
-        non vehicle paths (such as `cycleway` or `footpath`).
-    subclass: |
-        Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
-        precise styling.
-    properties: |
-        Additional properties describing the nature of road.
-        The properties `bridge` and `tunnel` can be combined with `oneway` as well. So to style all bridges the same you
-        should style both the properties `bridge` and `bridge:oneway`.
-        Properties can be one of `bridge:oneway`, `tunnel:oneway`, `ramp`, `ford`, `bridge`, `tunnel` or`oneway`.
+    class:
+      description: |
+          Distinguish between more and less important roads.
+      values:
+      - motorway
+      - trunk
+      - primary
+      - secondary
+      - tertiary
+      - minor
+      - track
+      - service
+      - path
+    subclass:
+      description: |
+          Use **subclass** to do more precise styling.
+          Original value of the
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
+      values:
+      - motorway
+      - motorway_link
+      - trunk
+      - trunk_link
+      - primary
+      - primary_link
+      - secondary
+      - secondary_link
+      - tertiary
+      - tertiary_link
+      - unclassified
+      - residential
+      - road
+      - living_street
+      - raceway
+      - construction
+      - track
+      - service
+      - path
+      - cycleway
+      - bridleway
+      - footway
+      - corridor
+      - crossing
+      - pedestrian
+      - rail
+      - narrow_gauge
+      - preserved
+      - funicular
+      - subway
+      - light_rail
+      - monorail
+      - tram
+    brunnel:
+      description: |
+          Mark whether way is a tunnel or bridge.
+      values:
+        - bridge
+        - tunnel
+        - ford
+    oneway:
+      description: |
+          Mark with `1` whether way is a oneway (in the direction of the way)
+          or not with `0`.
+      values: [0, 1]
+    ramp:
+      description: |
+          Mark with `1` whether way is a ramp (link or steps)
+          or not with `0`.
+      values: [0, 1]
+    service:
+      description: |
+          Original value of the [`service`](http://wiki.openstreetmap.org/wiki/Key:service) tag.
+      values:
+      - spur
+      - yard
+      - siding
+      - crossover
+      - driveway
+      - alley
+      - parking_aisle
   datasource:
     geometry_field: geometry
     srid: 900913
diff --git a/layers/transportation_name/transportation_name.yaml b/layers/transportation_name/transportation_name.yaml
index 27e55bf3..b5615a0a 100644
--- a/layers/transportation_name/transportation_name.yaml
+++ b/layers/transportation_name/transportation_name.yaml
@@ -11,12 +11,60 @@ layer:
     name: The OSM [`name`](http://wiki.openstreetmap.org/wiki/Highways#Names_and_references) value of the highway.
     ref: The OSM [`ref`](http://wiki.openstreetmap.org/wiki/Key:ref) tag of the motorway or road.
     ref_length: Length of the `ref` field. Useful for having a shield icon as background for labeling motorways.
-    class: |
-        Either `motorway`, `major_road` (containing `trunk`, `primary`, `secondary` and `tertiary` roads) and `minor_road` (less important roads in the hierarchy like `residential` or `service`) or `path` for
-        non vehicle paths (such as `cycleway` or `footpath`).
-    subclass: |
-        Original value of the [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) tag. Use this to do more
-        precise styling.
+    network: The OSM [`network`](http://wiki.openstreetmap.org/wiki/Key:network) tag of the road.
+    class:
+      description: |
+          Distinguish between more and less important roads.
+      values:
+      - motorway
+      - trunk
+      - primary
+      - secondary
+      - tertiary
+      - minor
+      - track
+      - service
+      - path
+    subclass:
+      description: |
+          Use **subclass** to do more precise styling.
+          Original value of the
+          [`highway`](http://wiki.openstreetmap.org/wiki/Key:highway) or
+          [`railway`](http://wiki.openstreetmap.org/wiki/Key:railway) tag.
+      values:
+      - motorway
+      - motorway_link
+      - trunk
+      - trunk_link
+      - primary
+      - primary_link
+      - secondary
+      - secondary_link
+      - tertiary
+      - tertiary_link
+      - unclassified
+      - residential
+      - road
+      - living_street
+      - raceway
+      - construction
+      - track
+      - service
+      - path
+      - cycleway
+      - bridleway
+      - footway
+      - corridor
+      - crossing
+      - pedestrian
+      - rail
+      - narrow_gauge
+      - preserved
+      - funicular
+      - subway
+      - light_rail
+      - monorail
+      - tram
   datasource:
     geometry_field: geometry
     srid: 900913