diff --git a/examples/bsp1.json b/examples/bsp1.json
index b878c8f..151b198 100644
--- a/examples/bsp1.json
+++ b/examples/bsp1.json
@@ -1 +1,27 @@
-{"@context":{"korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/","boundary":"korap:boundary/","group":"korap:group/","operation":{"@id":"group:operation/","@type":"@id"},"class":{"@id":"group:class","@type":"xsd:integer"},"operands":{"@id":"group:operands","@container":"@list"},"frame":{"@id":"group:frame/","@type":"@id"},"classRef":{"@id":"group:classRef","@type":"xsd:integer"},"spanRef":{"@id":"group:spanRef","@type":"xsd:integer"},"classRefOp":{"@id":"group:classRefOp","@type":"@id"},"min":{"@id":"boundary:min","@type":"xsd:integer"},"max":{"@id":"boundary:max","@type":"xsd:integer"},"exclude":{"@id":"group:exclude","@type":"xsd:boolean"},"distances":{"@id":"group:distances","@container":"@list"},"inOrder":{"@id":"group:inOrder","@type":"xsd:boolean"}},"query":{"type":"group","operation":"sequence","operands":[{"type":"token","key":{"type":"term","key":"Der","layer":"orth","match":"eq"}},{"type":"token","key":{"type":"term","key":"Mann","layer":"orth","match":"eq"}}]}}
\ No newline at end of file
+{
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
+   "query":{
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "operands":[
+         {
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
+               "key":"Der",
+               "layer":"orth",
+               "match":"eq"
+            }
+         },
+         {
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
+               "key":"Mann",
+               "layer":"orth",
+               "match":"eq"
+            }
+         }
+      ]
+   }
+}
\ No newline at end of file
diff --git a/examples/bsp2.json b/examples/bsp2.json
index 0593de0..f6d67a5 100644
--- a/examples/bsp2.json
+++ b/examples/bsp2.json
@@ -1,88 +1,36 @@
-{
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
-      "boundary":"korap:boundary/",
-      "group":"korap:group/",
-      "operation":{
-         "@id":"group:operation/",
-         "@type":"@id"
-      },
-      "class":{
-         "@id":"group:class",
-         "@type":"xsd:integer"
-      },
-      "operands":{
-         "@id":"group:operands",
-         "@container":"@list"
-      },
-      "frame":{
-         "@id":"group:frame/",
-         "@type":"@id"
-      },
-      "classRef":{
-         "@id":"group:classRef",
-         "@type":"xsd:integer"
-      },
-      "spanRef":{
-         "@id":"group:spanRef",
-         "@type":"xsd:integer"
-      },
-      "classRefOp":{
-         "@id":"group:classRefOp",
-         "@type":"@id"
-      },
-      "min":{
-         "@id":"boundary:min",
-         "@type":"xsd:integer"
-      },
-      "max":{
-         "@id":"boundary:max",
-         "@type":"xsd:integer"
-      },
-      "exclude":{
-         "@id":"group:exclude",
-         "@type":"xsd:boolean"
-      },
-      "distances":{
-         "@id":"group:distances",
-         "@container":"@list"
-      },
-      "inOrder":{
-         "@id":"group:inOrder",
-         "@type":"xsd:boolean"
-      }
-   },
-   "query":{
-      "type":"group",
-      "operation":"sequence",
-      "inOrder":"true",
-      "distances":[
-         {
-            "type":"distance",
-            "measure":"w",
-            "min":1,
-            "max":3
-         }
-      ],
-      "operands":[
-         {
-            "type":"token",
-            "key":{
-               "type":"term",
-               "key":"Der",
-               "layer":"orth",
-               "match":"eq"
-            }
-         },
-         {
-            "type":"token",
-            "key":{
-               "type":"term",
-               "key":"Mann",
-               "layer":"orth",
-               "match":"eq"
-            }
-         }
-      ]
-   }
+{
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
+   "query":{
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "inOrder":true,
+      "distances":[
+         {
+            "@type":"korap:distance",
+            "key":"w",
+            "min":1,
+            "max":3
+         }
+      ],
+      "operands":[
+         {
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
+               "key":"Der",
+               "layer":"orth",
+               "match":"eq"
+            }
+         },
+         {
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
+               "key":"Mann",
+               "layer":"orth",
+               "match":"eq"
+            }
+         }
+      ]
+   }
 }
\ No newline at end of file
diff --git a/examples/bsp3.json b/examples/bsp3.json
index 6912ac6..19cf64e 100644
--- a/examples/bsp3.json
+++ b/examples/bsp3.json
@@ -1,95 +1,43 @@
 {
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
-      "boundary":"korap:boundary/",
-      "group":"korap:group/",
-      "operation":{
-         "@id":"group:operation/",
-         "@type":"@id"
-      },
-      "class":{
-         "@id":"group:class",
-         "@type":"xsd:integer"
-      },
-      "operands":{
-         "@id":"group:operands",
-         "@container":"@list"
-      },
-      "frame":{
-         "@id":"group:frame/",
-         "@type":"@id"
-      },
-      "classRef":{
-         "@id":"group:classRef",
-         "@type":"xsd:integer"
-      },
-      "spanRef":{
-         "@id":"group:spanRef",
-         "@type":"xsd:integer"
-      },
-      "classRefOp":{
-         "@id":"group:classRefOp",
-         "@type":"@id"
-      },
-      "min":{
-         "@id":"boundary:min",
-         "@type":"xsd:integer"
-      },
-      "max":{
-         "@id":"boundary:max",
-         "@type":"xsd:integer"
-      },
-      "exclude":{
-         "@id":"group:exclude",
-         "@type":"xsd:boolean"
-      },
-      "distances":{
-         "@id":"group:distances",
-         "@container":"@list"
-      },
-      "inOrder":{
-         "@id":"group:inOrder",
-         "@type":"xsd:boolean"
-      }
-   },
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
    "query":{
-      "type":"group",
-      "operation":"sequence",
-      "inOrder":"true",
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "inOrder":true,
       "distances":[
          {
-            "type":"group",
-            "operation":"and",
+            "@type":"korap:group",
+            "operation":"operation:and",
             "operands":[
                {
-                  "type":"distance",
-                  "measure":"w",
-                  "min":"1",
-                  "max":"3"
+                  "@type":"korap:distance",
+                  "key":"w",
+                  "min":1,
+                  "max":3
                },
                {
-                  "type":"distance",
-                  "measure":"s",
-                  "min":"1",
-                  "max":"1"
+                  "@type":"korap:distance",
+                  "key":"s",
+                  "min":1,
+                  "max":1
                }
             ]
          }
       ],
       "operands":[
          {
-            "type":"token",
-            "key":{
-               "type":"term",
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
                "key":"Der",
                "layer":"orth",
                "match":"eq"
             }
          },
          {
-            "type":"token",
-            "key":{
-               "type":"term",
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
                "key":"Mann",
                "layer":"orth",
                "match":"eq"
diff --git a/examples/bsp4.json b/examples/bsp4.json
index b15ce11..42d57c7 100644
--- a/examples/bsp4.json
+++ b/examples/bsp4.json
@@ -1,124 +1,72 @@
-{
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
-      "boundary":"korap:boundary/",
-      "group":"korap:group/",
-      "operation":{
-         "@id":"group:operation/",
-         "@type":"@id"
-      },
-      "class":{
-         "@id":"group:class",
-         "@type":"xsd:integer"
-      },
-      "operands":{
-         "@id":"group:operands",
-         "@container":"@list"
-      },
-      "frame":{
-         "@id":"group:frame/",
-         "@type":"@id"
-      },
-      "classRef":{
-         "@id":"group:classRef",
-         "@type":"xsd:integer"
-      },
-      "spanRef":{
-         "@id":"group:spanRef",
-         "@type":"xsd:integer"
-      },
-      "classRefOp":{
-         "@id":"group:classRefOp",
-         "@type":"@id"
-      },
-      "min":{
-         "@id":"boundary:min",
-         "@type":"xsd:integer"
-      },
-      "max":{
-         "@id":"boundary:max",
-         "@type":"xsd:integer"
-      },
-      "exclude":{
-         "@id":"group:exclude",
-         "@type":"xsd:boolean"
-      },
-      "distances":{
-         "@id":"group:distances",
-         "@container":"@list"
-      },
-      "inOrder":{
-         "@id":"group:inOrder",
-         "@type":"xsd:boolean"
-      }
-   },
-   "query":{
-      "type":"group",
-      "operation":"sequence",
-      "inOrder":"true",
-      "distances":[
-         {
-            "type":"distance",
-            "measure":"w",
-            "min":0,
-            "max":5
-         }
-      ],
-      "operands":[
-         {
-            "type":"group",
-            "operation":"sequence",
-            "inOrder":"true",
-            "distances":[
-               {
-                  "type":"group",
-                  "operation":"and",
-                  "operands":[
-                     {
-                        "type":"distance",
-                        "measure":"w",
-                        "min":"1",
-                        "max":"3"
-                     },
-                     {
-                        "type":"distance",
-                        "measure":"s",
-                        "min":"1",
-                        "max":"1"
-                     }
-                  ]
-               }
-            ],
-            "operands":[
-               {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
-                     "key":"Der",
-                     "layer":"orth",
-                     "match":"eq"
-                  }
-               },
-               {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
-                     "key":"Mann",
-                     "layer":"orth",
-                     "match":"eq"
-                  }
-               }
-            ]
-         },
-         {
-            "type":"token",
-            "key":{
-               "type":"term",
-               "key":"geht",
-               "layer":"orth",
-               "match":"eq"
-            }
-         }
-      ]
-   }
+{
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
+   "query":{
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "inOrder":true,
+      "distances":[
+         {
+            "@type":"korap:distance",
+            "key":"w",
+            "min":0,
+            "max":5
+         }
+      ],
+      "operands":[
+         {
+            "@type":"korap:group",
+            "operation":"operation:sequence",
+            "inOrder":true,
+            "distances":[
+               {
+                  "@type":"korap:group",
+                  "operation":"operation:and",
+                  "operands":[
+                     {
+                        "@type":"korap:distance",
+                        "key":"w",
+                        "min":1,
+                        "max":3
+                     },
+                     {
+                        "@type":"korap:distance",
+                        "key":"s",
+                        "min":1,
+                        "max":1
+                     }
+                  ]
+               }
+            ],
+            "operands":[
+               {
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
+                     "key":"Der",
+                     "layer":"orth",
+                     "match":"eq"
+                  }
+               },
+               {
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
+                     "key":"Mann",
+                     "layer":"orth",
+                     "match":"eq"
+                  }
+               }
+            ]
+         },
+         {
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
+               "key":"geht",
+               "layer":"orth",
+               "match":"eq"
+            }
+         }
+      ]
+   }
 }
\ No newline at end of file
diff --git a/examples/bsp5.json b/examples/bsp5.json
index 67ad0b4..5dca716 100644
--- a/examples/bsp5.json
+++ b/examples/bsp5.json
@@ -1,117 +1,65 @@
 {
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
-      "boundary":"korap:boundary/",
-      "group":"korap:group/",
-      "operation":{
-         "@id":"group:operation/",
-         "@type":"@id"
-      },
-      "class":{
-         "@id":"group:class",
-         "@type":"xsd:integer"
-      },
-      "operands":{
-         "@id":"group:operands",
-         "@container":"@list"
-      },
-      "frame":{
-         "@id":"group:frame/",
-         "@type":"@id"
-      },
-      "classRef":{
-         "@id":"group:classRef",
-         "@type":"xsd:integer"
-      },
-      "spanRef":{
-         "@id":"group:spanRef",
-         "@type":"xsd:integer"
-      },
-      "classRefOp":{
-         "@id":"group:classRefOp",
-         "@type":"@id"
-      },
-      "min":{
-         "@id":"boundary:min",
-         "@type":"xsd:integer"
-      },
-      "max":{
-         "@id":"boundary:max",
-         "@type":"xsd:integer"
-      },
-      "exclude":{
-         "@id":"group:exclude",
-         "@type":"xsd:boolean"
-      },
-      "distances":{
-         "@id":"group:distances",
-         "@container":"@list"
-      },
-      "inOrder":{
-         "@id":"group:inOrder",
-         "@type":"xsd:boolean"
-      }
-   },
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
    "query":{
-      "type":"group",
-      "operation":"sequence",
-      "inOrder":"true",
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "inOrder":true,
       "distances":[
          {
-            "type":"distance",
-            "measure":"w",
+            "@type":"korap:distance",
+            "key":"w",
             "min":0,
             "max":5
          }
       ],
       "operands":[
          {
-            "type":"token",
-            "key":{
-               "type":"term",
+            "@type":"korap:token",
+            "wrap":{
+               "@type":"korap:term",
                "key":"geht",
                "layer":"orth",
                "match":"eq"
             }
          },
          {
-            "type":"group",
-            "operation":"sequence",
-            "inOrder":"true",
+            "@type":"korap:group",
+            "operation":"operation:sequence",
+            "inOrder":true,
             "distances":[
                {
-                  "type":"group",
-                  "operation":"and",
+                  "@type":"korap:group",
+                  "operation":"operation:and",
                   "operands":[
                      {
-                        "type":"distance",
-                        "measure":"w",
-                        "min":"1",
-                        "max":"3"
+                        "@type":"korap:distance",
+                        "key":"w",
+                        "min":1,
+                        "max":3
                      },
                      {
-                        "type":"distance",
-                        "measure":"s",
-                        "min":"1",
-                        "max":"1"
+                        "@type":"korap:distance",
+                        "key":"s",
+                        "min":1,
+                        "max":1
                      }
                   ]
                }
             ],
             "operands":[
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"Der",
                      "layer":"orth",
                      "match":"eq"
                   }
                },
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"Mann",
                      "layer":"orth",
                      "match":"eq"
diff --git a/examples/bsp6.json b/examples/bsp6.json
index d98d508..0e1b249 100644
--- a/examples/bsp6.json
+++ b/examples/bsp6.json
@@ -1,108 +1,56 @@
 {
-   "@context":{
-      "korap":"http://korap.ids-mannheim.de/ns/KorAP/json-ld/v0.1/",
-      "boundary":"korap:boundary/",
-      "group":"korap:group/",
-      "operation":{
-         "@id":"group:operation/",
-         "@type":"@id"
-      },
-      "class":{
-         "@id":"group:class",
-         "@type":"xsd:integer"
-      },
-      "operands":{
-         "@id":"group:operands",
-         "@container":"@list"
-      },
-      "frame":{
-         "@id":"group:frame/",
-         "@type":"@id"
-      },
-      "classRef":{
-         "@id":"group:classRef",
-         "@type":"xsd:integer"
-      },
-      "spanRef":{
-         "@id":"group:spanRef",
-         "@type":"xsd:integer"
-      },
-      "classRefOp":{
-         "@id":"group:classRefOp",
-         "@type":"@id"
-      },
-      "min":{
-         "@id":"boundary:min",
-         "@type":"xsd:integer"
-      },
-      "max":{
-         "@id":"boundary:max",
-         "@type":"xsd:integer"
-      },
-      "exclude":{
-         "@id":"group:exclude",
-         "@type":"xsd:boolean"
-      },
-      "distances":{
-         "@id":"group:distances",
-         "@container":"@list"
-      },
-      "inOrder":{
-         "@id":"group:inOrder",
-         "@type":"xsd:boolean"
-      }
-   },
+   "context":"http://ids-mannheim.de/ns/KorAP/json-ld/v0.1/context.jsonld",
    "query":{
-      "type":"group",
-      "operation":"sequence",
-      "inOrder":"true",
+      "@type":"korap:group",
+      "operation":"operation:sequence",
+      "inOrder":true,
       "distances":[
          {
-            "type":"distance",
-            "measure":"w",
+            "@type":"korap:distance",
+            "key":"w",
             "min":0,
             "max":5
          }
       ],
       "operands":[
          {
-            "type":"group",
-            "operation":"sequence",
-            "inOrder":"true",
+            "@type":"korap:group",
+            "operation":"operation:sequence",
+            "inOrder":true,
             "distances":[
                {
-                  "type":"group",
-                  "operation":"and",
+                  "@type":"korap:group",
+                  "operation":"operation:and",
                   "operands":[
                      {
-                        "type":"distance",
-                        "measure":"w",
-                        "min":"1",
-                        "max":"3"
+                        "@type":"korap:distance",
+                        "key":"w",
+                        "min":1,
+                        "max":3
                      },
                      {
-                        "type":"distance",
-                        "measure":"s",
-                        "min":"1",
-                        "max":"1"
+                        "@type":"korap:distance",
+                        "key":"s",
+                        "min":1,
+                        "max":1
                      }
                   ]
                }
             ],
             "operands":[
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"Der",
                      "layer":"orth",
                      "match":"eq"
                   }
                },
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"Mann",
                      "layer":"orth",
                      "match":"eq"
@@ -111,22 +59,22 @@
             ]
          },
          {
-            "type":"group",
-            "operation":"sequence",
+            "@type":"korap:group",
+            "operation":"operation:sequence",
             "operands":[
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"geht",
                      "layer":"orth",
                      "match":"eq"
                   }
                },
                {
-                  "type":"token",
-                  "key":{
-                     "type":"term",
+                  "@type":"korap:token",
+                  "wrap":{
+                     "@type":"korap:term",
                      "key":"weg",
                      "layer":"orth",
                      "match":"eq"