--- a/test-suite/tests/flatten-0002-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0002-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -34,5 +34,11 @@
                 "@value": 51
             }
         ]
+    },
+    {
+        "@id": "http://example.com/t1"
+    },
+    {
+        "@id": "http://example.com/t2"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0005-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0005-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,16 +1,24 @@
 [
     {
-        "@id": "http://json-ld.org/test-suite/tests/flatten-0005-in.jsonld#me",
-        "http://xmlns.com/foaf/0.1/knows": [
+        "@id": "http://example.com/alice"
+    },
+    {
+        "@id": "http://example.com/alice#me",
+        "http://xmlns.com/foaf/0.1/homepage": [
             {
-                "@id": "http://example.com/bob#me"
-            },
+                "@id": "http://example.com/alice"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/name": [
             {
-                "@id": "http://example.com/alice#me"
+                "@value": "Alice"
             }
         ]
     },
     {
+        "@id": "http://example.com/bob"
+    },
+    {
         "@id": "http://example.com/bob#me",
         "http://xmlns.com/foaf/0.1/homepage": [
             {
@@ -24,22 +32,14 @@
         ]
     },
     {
-        "@id": "http://example.com/bob"
-    },
-    {
-        "@id": "http://example.com/alice#me",
-        "http://xmlns.com/foaf/0.1/homepage": [
+        "@id": "http://json-ld.org/test-suite/tests/flatten-0005-in.jsonld#me",
+        "http://xmlns.com/foaf/0.1/knows": [
             {
-                "@id": "http://example.com/alice"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/name": [
+                "@id": "http://example.com/bob#me"
+            },
             {
-                "@value": "Alice"
+                "@id": "http://example.com/alice#me"
             }
         ]
-    },
-    {
-        "@id": "http://example.com/alice"
     }
-]
+]
\ No newline at end of file

--- a/test-suite/tests/flatten-0007-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0007-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -20,5 +20,8 @@
                 "@id": "http://example.org/test#example1"
             }
         ]
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#dateTime"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0009-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0009-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,23 @@
 [
     {
+        "@id": "http://example.org/test#book",
+        "http://example.org/vocab#contains": [
+            {
+                "@id": "http://example.org/test#chapter"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/contributor": [
+            {
+                "@value": "Writer"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/title": [
+            {
+                "@value": "My Book"
+            }
+        ]
+    },
+    {
         "@id": "http://example.org/test#chapter",
         "http://purl.org/dc/elements/1.1/description": [
             {
@@ -40,23 +58,5 @@
                 "@id": "http://example.org/test#book"
             }
         ]
-    },
-    {
-        "@id": "http://example.org/test#book",
-        "http://example.org/vocab#contains": [
-            {
-                "@id": "http://example.org/test#chapter"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/contributor": [
-            {
-                "@value": "Writer"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/title": [
-            {
-                "@value": "My Book"
-            }
-        ]
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0012-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0012-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,23 @@
 [
     {
+        "@id": "http://example.org/test#book",
+        "http://example.org/vocab#contains": [
+            {
+                "@id": "http://example.org/test#chapter"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/contributor": [
+            {
+                "@value": "Writer"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/title": [
+            {
+                "@value": "My Book"
+            }
+        ]
+    },
+    {
         "@id": "http://example.org/test#chapter",
         "http://purl.org/dc/elements/1.1/description": [
             {
@@ -40,23 +58,5 @@
                 "@id": "http://example.org/test#book"
             }
         ]
-    },
-    {
-        "@id": "http://example.org/test#book",
-        "http://example.org/vocab#contains": [
-            {
-                "@id": "http://example.org/test#chapter"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/contributor": [
-            {
-                "@value": "Writer"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/title": [
-            {
-                "@value": "My Book"
-            }
-        ]
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0013-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0013-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -34,5 +34,11 @@
                 "@value": 51
             }
         ]
+    },
+    {
+        "@id": "http://example.com/t1"
+    },
+    {
+        "@id": "http://example.com/t2"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0014-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0014-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -44,5 +44,8 @@
                 "@value": "2012-03-31"
             }
         ]
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#date"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0016-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0016-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,8 @@
 [
     {
+        "@id": "_:t0"
+    },
+    {
         "@id": "http://example.org/id1",
         "http://example.com/emptyobj": [
             {
@@ -38,9 +41,6 @@
         ]
     },
     {
-        "@id": "_:t0"
-    },
-    {
         "@id": "http://example.org/id2",
         "http://example.org/myproperty2": [
             {

--- a/test-suite/tests/flatten-0017-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0017-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,23 @@
 [
     {
+        "@id": "http://example.org/test#book",
+        "http://example.org/vocab#contains": [
+            {
+                "@id": "http://example.org/test#chapter"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/contributor": [
+            {
+                "@value": "Writer"
+            }
+        ],
+        "http://purl.org/dc/elements/1.1/title": [
+            {
+                "@value": "My Book"
+            }
+        ]
+    },
+    {
         "@id": "http://example.org/test#chapter",
         "http://purl.org/dc/elements/1.1/description": [
             {
@@ -40,23 +58,5 @@
                 "@id": "http://example.org/test#book"
             }
         ]
-    },
-    {
-        "@id": "http://example.org/test#book",
-        "http://example.org/vocab#contains": [
-            {
-                "@id": "http://example.org/test#chapter"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/contributor": [
-            {
-                "@value": "Writer"
-            }
-        ],
-        "http://purl.org/dc/elements/1.1/title": [
-            {
-                "@value": "My Book"
-            }
-        ]
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0018-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0018-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -8,6 +8,9 @@
             },
             {
                 "@value": 2
+            },
+            {
+                "@value": true
             }
         ],
         "http://example.org/vocab#nolang": [
@@ -28,6 +31,9 @@
             },
             {
                 "@value": 1
+            },
+            {
+                "@value": true
             }
         ]
     }

--- a/test-suite/tests/flatten-0020-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0020-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,18 +1,5 @@
 [
     {
-        "@id": "http://example.org/test#jane",
-        "http://example.org/vocab#authored": [
-            {
-                "@id": "_:t0"
-            }
-        ],
-        "http://xmlns.com/foaf/0.1/name": [
-            {
-                "@value": "Jane"
-            }
-        ]
-    },
-    {
         "@id": "_:t0",
         "@graph": [
             {
@@ -44,22 +31,6 @@
         ]
     },
     {
-        "@id": "http://example.org/test#john",
-        "http://xmlns.com/foaf/0.1/name": [
-            {
-                "@value": "John"
-            }
-        ]
-    },
-    {
-        "@id": "http://example.org/test#library",
-        "http://example.org/vocab#contains": [
-            {
-                "@id": "http://example.org/test#book"
-            }
-        ]
-    },
-    {
         "@id": "http://example.org/test#book",
         "http://example.org/vocab#contains": [
             {
@@ -79,5 +50,34 @@
     },
     {
         "@id": "http://example.org/test#chapter"
+    },
+    {
+        "@id": "http://example.org/test#jane",
+        "http://example.org/vocab#authored": [
+            {
+                "@id": "_:t0"
+            }
+        ],
+        "http://xmlns.com/foaf/0.1/name": [
+            {
+                "@value": "Jane"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/test#john",
+        "http://xmlns.com/foaf/0.1/name": [
+            {
+                "@value": "John"
+            }
+        ]
+    },
+    {
+        "@id": "http://example.org/test#library",
+        "http://example.org/vocab#contains": [
+            {
+                "@id": "http://example.org/test#book"
+            }
+        ]
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0021-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0021-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -8,38 +8,9 @@
         ],
         "@graph": [
             {
-                "@id": "http://example.org/test#jane",
-                "http://example.org/vocab#authored": [
-                    {
-                        "@id": "_:t1"
-                    }
-                ],
-                "http://xmlns.com/foaf/0.1/name": [
-                    {
-                        "@value": "Jane"
-                    }
-                ]
-            },
-            {
                 "@id": "_:t1"
             },
             {
-                "@id": "http://example.org/test#john",
-                "http://xmlns.com/foaf/0.1/name": [
-                    {
-                        "@value": "John"
-                    }
-                ]
-            },
-            {
-                "@id": "http://example.org/test#library",
-                "http://example.org/vocab#contains": [
-                    {
-                        "@id": "http://example.org/test#book"
-                    }
-                ]
-            },
-            {
                 "@id": "http://example.org/test#book",
                 "http://example.org/vocab#contains": [
                     {
@@ -59,6 +30,35 @@
             },
             {
                 "@id": "http://example.org/test#chapter"
+            },
+            {
+                "@id": "http://example.org/test#jane",
+                "http://example.org/vocab#authored": [
+                    {
+                        "@id": "_:t1"
+                    }
+                ],
+                "http://xmlns.com/foaf/0.1/name": [
+                    {
+                        "@value": "Jane"
+                    }
+                ]
+            },
+            {
+                "@id": "http://example.org/test#john",
+                "http://xmlns.com/foaf/0.1/name": [
+                    {
+                        "@value": "John"
+                    }
+                ]
+            },
+            {
+                "@id": "http://example.org/test#library",
+                "http://example.org/vocab#contains": [
+                    {
+                        "@id": "http://example.org/test#book"
+                    }
+                ]
             }
         ]
     },

--- a/test-suite/tests/flatten-0023-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0023-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -64,5 +64,8 @@
     },
     {
         "@id": "http://example.org/id"
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#date"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0025-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0025-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,11 @@
 [
     {
+        "@id": "http://example.com/bar"
+    },
+    {
+        "@id": "http://example.com/foo/"
+    },
+    {
         "@id": "http://example.com/underscore/",
         "http://example.com/bar": [
             {
@@ -9,11 +15,5 @@
                 "@id": "http://example.com/bar"
             }
         ]
-    },
-    {
-        "@id": "http://example.com/foo/"
-    },
-    {
-        "@id": "http://example.com/bar"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0026-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0026-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -6,6 +6,9 @@
         ]
     },
     {
+        "@id": "http://example.com/b"
+    },
+    {
         "@id": "http://example.com/c",
         "@type": [
             "http://example.com/d",
@@ -13,9 +16,18 @@
         ]
     },
     {
+        "@id": "http://example.com/d"
+    },
+    {
+        "@id": "http://example.com/e"
+    },
+    {
         "@id": "http://example.com/f",
         "@type": [
             "http://example.com/g"
         ]
+    },
+    {
+        "@id": "http://example.com/g"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0028-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0028-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,11 @@
 [
     {
+        "@id": "http://example.org/vocab#dateTime"
+    },
+    {
+        "@id": "http://example.org/vocab#test"
+    },
+    {
         "@id": "http://json-ld.org/test-suite/tests/example1",
         "@type": [
             "http://example.org/vocab#test"

--- a/test-suite/tests/flatten-0029-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0029-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,35 @@
 [
     {
+        "@id": "http://example.org/scheme-relative"
+    },
+    {
+        "@id": "http://json-ld.org/absolute"
+    },
+    {
+        "@id": "http://json-ld.org/parent-parent-eq-root"
+    },
+    {
+        "@id": "http://json-ld.org/still-root"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/parent"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/tests/"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/tests/flatten-0029-in.jsonld#fragment-works"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/tests/flatten-0029-in.jsonld?query=works"
+    },
+    {
+        "@id": "http://json-ld.org/test-suite/tests/link"
+    },
+    {
         "@id": "http://json-ld.org/test-suite/tests/relativeIris",
         "@type": [
             "http://json-ld.org/test-suite/tests/link",
@@ -55,36 +85,6 @@
         ]
     },
     {
-        "@id": "http://json-ld.org/test-suite/tests/link"
-    },
-    {
-        "@id": "http://json-ld.org/test-suite/tests/flatten-0029-in.jsonld#fragment-works"
-    },
-    {
-        "@id": "http://json-ld.org/test-suite/tests/flatten-0029-in.jsonld?query=works"
-    },
-    {
-        "@id": "http://json-ld.org/test-suite/tests/"
-    },
-    {
-        "@id": "http://json-ld.org/test-suite/"
-    },
-    {
-        "@id": "http://json-ld.org/test-suite/parent"
-    },
-    {
-        "@id": "http://json-ld.org/parent-parent-eq-root"
-    },
-    {
-        "@id": "http://json-ld.org/still-root"
-    },
-    {
         "@id": "http://json-ld.org/too-many-dots"
-    },
-    {
-        "@id": "http://json-ld.org/absolute"
-    },
-    {
-        "@id": "http://example.org/scheme-relative"
     }
-]
+]
\ No newline at end of file

--- a/test-suite/tests/flatten-0031-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0031-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -19,5 +19,14 @@
                 "@type": "http://www.w3.org/2001/XMLSchema#integer"
             }
         ]
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#boolean"
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#double"
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#integer"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0033-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0033-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -20,5 +20,8 @@
     },
     {
         "@id": "http://www.markus-lanthaler.com/"
+    },
+    {
+        "@id": "http://www.w3.org/2001/XMLSchema#date"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0036-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0036-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -13,6 +13,10 @@
                 "@annotation": "A"
             },
             {
+                "@value": true,
+                "@annotation": "A"
+            },
+            {
                 "@value": false,
                 "@annotation": "A"
             },
@@ -45,6 +49,10 @@
                 "@annotation": "C"
             },
             {
+                "@value": true,
+                "@annotation": "C"
+            },
+            {
                 "@value": false,
                 "@annotation": "C"
             },
@@ -76,6 +84,10 @@
             },
             {
                 "@annotation": "prop",
+                "@value": true
+            },
+            {
+                "@annotation": "prop",
                 "@value": false
             },
             {
@@ -98,36 +110,29 @@
         ]
     },
     {
-        "@id": "http://example.org/nodeWithoutAnnotationA",
-        "@annotation": [
-            "A"
-        ]
+        "@id": "http://example.org/nodeWithAnnotationA",
+        "@annotation": "this overrides the 'A' annotation from the container"
     },
     {
-        "@id": "http://example.org/nodeWithAnnotationA",
-        "@annotation": [
-            "this overrides the 'A' annotation from the container"
-        ]
+        "@id": "http://example.org/nodeWithAnnotationC",
+        "@annotation": "this overrides the 'C' annotation from the container"
+    },
+    {
+        "@id": "http://example.org/nodeWithAnnotationProp",
+        "@annotation": "prop"
+    },
+    {
+        "@id": "http://example.org/nodeWithoutAnnotationA",
+        "@annotation": "A"
     },
     {
         "@id": "http://example.org/nodeWithoutAnnotationC",
-        "@annotation": [
-            "C"
-        ]
-    },
-    {
-        "@id": "http://example.org/nodeWithAnnotationC",
-        "@annotation": [
-            "this overrides the 'C' annotation from the container"
-        ]
+        "@annotation": "C"
     },
     {
         "@id": "http://example.org/nodeWithoutAnnotationProp"
     },
     {
-        "@id": "http://example.org/nodeWithAnnotationProp",
-        "@annotation": [
-            "prop"
-        ]
+        "@id": "http://example.org/type"
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/flatten-0038-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0038-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -2,6 +2,8 @@
     {
         "@id": "_:t0",
         "@type": [
+            "_:t0",
+            "_:t0",
             "_:t0"
         ],
         "_:t0": [

--- a/test-suite/tests/flatten-0039-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/flatten-0039-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -1,5 +1,279 @@
 [
     {
+        "@id": "_:t0",
+        "http://example.com/vocab/term": [
+
+        ]
+    },
+    {
+        "@id": "_:t1",
+        "http://example.com/vocab/nested": [
+
+        ],
+        "http://example.com/vocab/term": [
+
+        ]
+    },
+    {
+        "@id": "_:t10",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "collission",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t11",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propA.2",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t12",
+        "http://example.com/vocab/nested": [
+            {
+                "@id": "_:t13"
+            },
+            {
+                "@id": "http://ex.com/propA.5.2"
+            }
+        ],
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propA.5",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t13",
+        "http://example.com/vocab/nested": [
+            {
+                "@value": 10510
+            },
+            {
+                "@value": "propA.5.1.1",
+                "@language": "de"
+            },
+            {
+                "@id": "http://ex.com/propA.5.1.2"
+            },
+            {
+                "@id": "_:t14"
+            }
+        ],
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propA.5.1",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t14",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propA.5.1.3",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t15",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propA.5.2.2",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t16",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "collission",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t17",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "collission",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t2",
+        "http://example.com/vocab/term": [
+
+        ]
+    },
+    {
+        "@id": "_:t3",
+        "http://example.com/vocab/term": [
+
+        ]
+    },
+    {
+        "@id": "_:t4",
+        "http://example.com/vocab/term": [
+
+        ]
+    },
+    {
+        "@id": "_:t5",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "collission",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t6",
+        "http://example.com/vocab/nested": [
+            {
+                "@id": "_:t7"
+            },
+            {
+                "@id": "http://ex.com/propC.5.2"
+            }
+        ],
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propC.5",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t7",
+        "http://example.com/vocab/nested": [
+            {
+                "@value": 10510
+            },
+            {
+                "@value": "propC.5.1.1",
+                "@language": "de"
+            },
+            {
+                "@id": "http://ex.com/propC.5.1.2"
+            },
+            {
+                "@id": "_:t8"
+            }
+        ],
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propC.5.1",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t8",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propC.5.1.3",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "_:t9",
+        "http://example.com/vocab/term": [
+            {
+                "@value": "http://ex.com/propC.5.2.2",
+                "@language": "de"
+            }
+        ]
+    },
+    {
+        "@id": "http://datatype.example.org/type"
+    },
+    {
+        "@id": "http://ex.com/propA.1"
+    },
+    {
+        "@id": "http://ex.com/propA.4"
+    },
+    {
+        "@id": "http://ex.com/propA.5.1.2"
+    },
+    {
+        "@id": "http://ex.com/propA.5.2",
+        "http://example.com/vocab/nested": [
+            {
+                "@value": "propA.5.2.1",
+                "@language": "de"
+            },
+            {
+                "@id": "_:t15"
+            },
+            {
+                "@id": "http://ex.com/propA.5.2.3"
+            },
+            {
+                "@value": 10524
+            }
+        ]
+    },
+    {
+        "@id": "http://ex.com/propA.5.2.3"
+    },
+    {
+        "@id": "http://ex.com/propB.2",
+        "http://example.com/vocab/nested": [
+
+        ]
+    },
+    {
+        "@id": "http://ex.com/propB.2.1.2"
+    },
+    {
+        "@id": "http://ex.com/propB.2.2",
+        "http://example.com/vocab/nested": [
+
+        ]
+    },
+    {
+        "@id": "http://ex.com/propB.2.2.3"
+    },
+    {
+        "@id": "http://ex.com/propC.4"
+    },
+    {
+        "@id": "http://ex.com/propC.5.1.2"
+    },
+    {
+        "@id": "http://ex.com/propC.5.2",
+        "http://example.com/vocab/nested": [
+            {
+                "@value": "propC.5.2.1",
+                "@language": "de"
+            },
+            {
+                "@id": "_:t9"
+            },
+            {
+                "@id": "http://ex.com/propC.5.2.3"
+            },
+            {
+                "@value": 10524
+            }
+        ]
+    },
+    {
+        "@id": "http://ex.com/propC.5.2.3"
+    },
+    {
         "@id": "http://ex.com/root",
         "http://example.com/somethingElse": [
             {
@@ -16,10 +290,62 @@
                         "@id": "_:t0"
                     },
                     {
+                        "@value": "collission",
+                        "@language": "de"
+                    },
+                    {
                         "@id": "http://ex.com/propB.2"
                     },
                     {
+                        "@id": "_:t1"
+                    },
+                    {
+                        "@value": 20110
+                    },
+                    {
+                        "@value": "propB.2.1.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.1.2"
+                    },
+                    {
+                        "@id": "_:t2"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1.3",
+                        "@language": "de"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2"
+                    },
+                    {
+                        "@value": "propB.2.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "_:t3"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.2.2",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2.3"
+                    },
+                    {
+                        "@value": 20224
+                    },
+                    {
                         "@id": "_:t4"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.3",
+                        "@language": "de"
                     }
                 ]
             },
@@ -93,10 +419,62 @@
                         "@id": "_:t0"
                     },
                     {
+                        "@value": "collission",
+                        "@language": "de"
+                    },
+                    {
                         "@id": "http://ex.com/propB.2"
                     },
                     {
+                        "@id": "_:t1"
+                    },
+                    {
+                        "@value": 20110
+                    },
+                    {
+                        "@value": "propB.2.1.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.1.2"
+                    },
+                    {
+                        "@id": "_:t2"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1.3",
+                        "@language": "de"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2"
+                    },
+                    {
+                        "@value": "propB.2.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "_:t3"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.2.2",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2.3"
+                    },
+                    {
+                        "@value": 20224
+                    },
+                    {
                         "@id": "_:t4"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.3",
+                        "@language": "de"
                     }
                 ]
             },
@@ -154,10 +532,62 @@
                         "@id": "_:t0"
                     },
                     {
+                        "@value": "collission",
+                        "@language": "de"
+                    },
+                    {
                         "@id": "http://ex.com/propB.2"
                     },
                     {
+                        "@id": "_:t1"
+                    },
+                    {
+                        "@value": 20110
+                    },
+                    {
+                        "@value": "propB.2.1.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.1.2"
+                    },
+                    {
+                        "@id": "_:t2"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1.3",
+                        "@language": "de"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2"
+                    },
+                    {
+                        "@value": "propB.2.2.1",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "_:t3"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.2.2.2",
+                        "@language": "de"
+                    },
+                    {
+                        "@id": "http://ex.com/propB.2.2.3"
+                    },
+                    {
+                        "@value": 20224
+                    },
+                    {
                         "@id": "_:t4"
+                    },
+                    {
+                        "@value": "http://ex.com/propB.3",
+                        "@language": "de"
                     }
                 ]
             },
@@ -178,320 +608,5 @@
                 "@id": "_:t6"
             }
         ]
-    },
-    {
-        "@id": "_:t0",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@id": "_:t1"
-            },
-            {
-                "@id": "http://ex.com/propB.2.2"
-            }
-        ]
-    },
-    {
-        "@id": "_:t1",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": 20110
-            },
-            {
-                "@value": "propB.2.1.1",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propB.2.1.2"
-            },
-            {
-                "@id": "_:t2"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propB.2.1",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2.1.2"
-    },
-    {
-        "@id": "_:t2",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propB.2.1.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": "propB.2.2.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:t3"
-            },
-            {
-                "@id": "http://ex.com/propB.2.2.3"
-            },
-            {
-                "@value": 20224
-            }
-        ]
-    },
-    {
-        "@id": "_:t3",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propB.2.2.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propB.2.2.3"
-    },
-    {
-        "@id": "_:t4",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propB.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:t5",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propC.4"
-    },
-    {
-        "@id": "_:t6",
-        "http://example.com/vocab/nested": [
-            {
-                "@id": "_:t7"
-            },
-            {
-                "@id": "http://ex.com/propC.5.2"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:t7",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": 10510
-            },
-            {
-                "@value": "propC.5.1.1",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propC.5.1.2"
-            },
-            {
-                "@id": "_:t8"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.1",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propC.5.1.2"
-    },
-    {
-        "@id": "_:t8",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.1.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propC.5.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": "propC.5.2.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:t9"
-            },
-            {
-                "@id": "http://ex.com/propC.5.2.3"
-            },
-            {
-                "@value": 10524
-            }
-        ]
-    },
-    {
-        "@id": "_:t9",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propC.5.2.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propC.5.2.3"
-    },
-    {
-        "@id": "_:t10",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.1"
-    },
-    {
-        "@id": "_:t11",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.4"
-    },
-    {
-        "@id": "_:t12",
-        "http://example.com/vocab/nested": [
-            {
-                "@id": "_:t13"
-            },
-            {
-                "@id": "http://ex.com/propA.5.2"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:t13",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": 10510
-            },
-            {
-                "@value": "propA.5.1.1",
-                "@language": "de"
-            },
-            {
-                "@id": "http://ex.com/propA.5.1.2"
-            },
-            {
-                "@id": "_:t14"
-            }
-        ],
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.1",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.5.1.2"
-    },
-    {
-        "@id": "_:t14",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.1.3",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.5.2",
-        "http://example.com/vocab/nested": [
-            {
-                "@value": "propA.5.2.1",
-                "@language": "de"
-            },
-            {
-                "@id": "_:t15"
-            },
-            {
-                "@id": "http://ex.com/propA.5.2.3"
-            },
-            {
-                "@value": 10524
-            }
-        ]
-    },
-    {
-        "@id": "_:t15",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "http://ex.com/propA.5.2.2",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "http://ex.com/propA.5.2.3"
-    },
-    {
-        "@id": "_:t16",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
-    },
-    {
-        "@id": "_:t17",
-        "http://example.com/vocab/term": [
-            {
-                "@value": "collission",
-                "@language": "de"
-            }
-        ]
     }
 ]
\ No newline at end of file

--- a/test-suite/tests/frame-0020-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/frame-0020-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -49,6 +49,8 @@
     },
     "http://rdf.data-vocabulary.org/#description": "Crush lime juice, mint and sugar together in glass."
   }, {
+    "@id": "http://www.w3.org/2001/XMLSchema#integer"
+  }, {
     "@id": "_:t2",
     "http://rdf.data-vocabulary.org/#step": {
       "@value": 2,
@@ -77,4 +79,4 @@
     },
     "http://rdf.data-vocabulary.org/#description": "Garnish with a lime wedge."
   }]
-}
\ No newline at end of file
+}

--- a/test-suite/tests/frame-0021-out.jsonld	Fri Dec 21 15:56:29 2012 +0100
+++ b/test-suite/tests/frame-0021-out.jsonld	Fri Dec 21 19:09:09 2012 +0100
@@ -9,6 +9,8 @@
     "@id": "_:t0",
     "dc:label": "Book type"
   }, {
+    "@id": "ex:Library"
+  }, {
     "@id": "http://example.org/library",
     "@type": "ex:Library",
     "ex:contains": {
@@ -42,5 +44,7 @@
     "dc:description": "An introductory chapter on The Republic.",
     "dc:list": [1, 2, 3, 4, 4, 4, 5],
     "dc:title": "The Introduction"
+  }, {
+    "@id": "ex:Chapter"
   }]
-}
\ No newline at end of file
+}