diff --git a/cache/binary/serialize_test.go b/cache/binary/serialize_test.go
index e7d567c..9bbf4e7 100644
--- a/cache/binary/serialize_test.go
+++ b/cache/binary/serialize_test.go
@@ -1,8 +1,9 @@
 package binary
 
 import (
-	"github.com/omniscale/imposm3/element"
 	"testing"
+
+	"github.com/omniscale/imposm3/element"
 )
 
 func compareRefs(a []int64, b []int64) bool {
@@ -74,8 +75,8 @@ func TestMarshalRelation(t *testing.T) {
 	rel.Tags = make(element.Tags)
 	rel.Tags["name"] = "test"
 	rel.Tags["landusage"] = "forest"
-	rel.Members = append(rel.Members, element.Member{123, element.WAY, "outer", nil})
-	rel.Members = append(rel.Members, element.Member{124, element.WAY, "inner", nil})
+	rel.Members = append(rel.Members, element.Member{Id: 123, Type: element.WAY, Role: "outer"})
+	rel.Members = append(rel.Members, element.Member{Id: 124, Type: element.WAY, Role: "inner"})
 
 	data, _ := MarshalRelation(rel)
 	rel, _ = UnmarshalRelation(data)
diff --git a/geom/multipolygon_test.go b/geom/multipolygon_test.go
index bdc6cad..dc31b1c 100644
--- a/geom/multipolygon_test.go
+++ b/geom/multipolygon_test.go
@@ -53,8 +53,8 @@ func TestSimplePolygonWithHole(t *testing.T) {
 	rel := element.Relation{
 		OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -96,8 +96,8 @@ func TestMultiPolygonWithHoleAndRelName(t *testing.T) {
 	rel := element.Relation{
 		OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{"name": "rel"}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -149,9 +149,9 @@ func TestMultiPolygonWithMultipleHoles(t *testing.T) {
 	rel := element.Relation{
 		OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{"landusage": "forest"}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
-		{3, element.WAY, "inner", &w3},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
+		{Id: 3, Type: element.WAY, Role: "inner", Way: &w3},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -216,11 +216,11 @@ func TestMultiPolygonWithNeastedHoles(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
-		{3, element.WAY, "inner", &w3},
-		{4, element.WAY, "inner", &w4},
-		{5, element.WAY, "inner", &w5},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
+		{Id: 3, Type: element.WAY, Role: "inner", Way: &w3},
+		{Id: 4, Type: element.WAY, Role: "inner", Way: &w4},
+		{Id: 5, Type: element.WAY, Role: "inner", Way: &w5},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -263,9 +263,9 @@ func TestPolygonFromThreeWays(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
-		{3, element.WAY, "inner", &w3},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
+		{Id: 3, Type: element.WAY, Role: "inner", Way: &w3},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -316,9 +316,9 @@ func TestTouchingPolygonsWithHole(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{"water": "riverbank"}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "outer", &w2},
-		{3, element.WAY, "inner", &w3},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "outer", Way: &w2},
+		{Id: 3, Type: element.WAY, Role: "inner", Way: &w3},
 	}
 	geom, err := buildRelation(&rel, 3857)
 	if err != nil {
@@ -358,8 +358,8 @@ func TestInsertedWaysDifferentTags(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{"landusage": "forest"}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -400,8 +400,8 @@ func TestInsertMultipleTags(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{"landusage": "forest"}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1}, // also highway=secondary
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1}, // also highway=secondary
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -449,8 +449,8 @@ func TestBrokenPolygonSelfIntersect(t *testing.T) {
 
 	rel1 := element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel1.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom1, err := buildRelation(&rel1, 3857)
@@ -490,8 +490,8 @@ func TestBrokenPolygonSelfIntersect(t *testing.T) {
 
 	rel2 := element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel2.Members = []element.Member{
-		{1, element.WAY, "outer", &w3},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w3},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom2, err := buildRelation(&rel2, 3857)
@@ -539,8 +539,8 @@ func TestBrokenPolygonSelfIntersectTriangle(t *testing.T) {
 
 	rel := element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "inner", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w2},
 	}
 
 	geom, err := buildRelation(&rel, 3857)
@@ -579,8 +579,8 @@ func TestBrokenPolygonSelfIntersectTriangle(t *testing.T) {
 
 	rel = element.Relation{OSMElem: element.OSMElem{Id: 1}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w3},
-		{2, element.WAY, "inner", &w4},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w3},
+		{Id: 2, Type: element.WAY, Role: "inner", Way: &w4},
 	}
 
 	geom, err = buildRelation(&rel, 3857)
@@ -610,7 +610,7 @@ func TestOpenRing(t *testing.T) {
 	rel := element.Relation{
 		OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
 	}
 
 	_, err := buildRelation(&rel, 3857)
@@ -634,8 +634,8 @@ func TestClosedAndOpenRing(t *testing.T) {
 	rel := element.Relation{
 		OSMElem: element.OSMElem{Id: 1, Tags: element.Tags{}}}
 	rel.Members = []element.Member{
-		{1, element.WAY, "outer", &w1},
-		{2, element.WAY, "outer", &w2},
+		{Id: 1, Type: element.WAY, Role: "outer", Way: &w1},
+		{Id: 2, Type: element.WAY, Role: "outer", Way: &w2},
 	}
 
 	prep, err := PrepareRelation(&rel, 3857, 0.1)