diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2f15e4fd..226630d4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -130,30 +130,6 @@ jobs:
           sleep 5
           make test-conformance
 
-
-  elasticTest:
-    needs: build
-    name: Elastic Test
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v4
-      - name: Python Dependencies for Conformance
-        run: pip install requests numpy
-      - name: Download grip
-        uses: actions/download-artifact@v4
-        with:
-          name: gripBin
-      - name: Elastic Conformance
-        run: |
-          chmod +x grip
-          make start-elastic
-          sleep 15
-          ./grip server --rpc-port 18202 --http-port 18201 --config ./test/elastic.yml &
-          sleep 5
-          make test-conformance
-
-
   postgresTest:
     needs: build
     name: Postgres Test
diff --git a/.gitignore b/.gitignore
index a7c43db8..75eb8e5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ gripql/R/*.tar.gz
 # dev tools
 .idea/
 .vscode/
+.DS_Store
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e8d047d8..0af8254c 100644
--- a/Makefile
+++ b/Makefile
@@ -132,10 +132,6 @@ start-mongo:
 	@docker rm -f grip-mongodb-test > /dev/null 2>&1 || echo
 	docker run -d --name grip-mongodb-test -p 27017:27017 mongo:7.0.13-rc0-jammy > /dev/null
 
-start-elastic:
-	@docker rm -f grip-es-test > /dev/null 2>&1 || echo
-	docker run -d --name grip-es-test -p 19200:9200 -p 9300:9300 -e "discovery.type=single-node" -e "xpack.security.enabled=false" docker.elastic.co/elasticsearch/elasticsearch:5.6.3 > /dev/null
-
 start-postgres:
 	@docker rm -f grip-postgres-test > /dev/null 2>&1 || echo
 	docker run -d --name grip-postgres-test -p 15432:5432 -e POSTGRES_PASSWORD= -e POSTGRES_USER=postgres postgres:10.4 > /dev/null
diff --git a/README.md b/README.md
index 3bc84476..faa2232e 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 https://bmeg.github.io/grip/
 
-GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
+GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
 
 Properties of an GRIP graph:
 
diff --git a/accounts/bulk_write_filter.go b/accounts/bulk_write_filter.go
index dafa875c..5f7c704b 100644
--- a/accounts/bulk_write_filter.go
+++ b/accounts/bulk_write_filter.go
@@ -52,3 +52,47 @@ func (bw *BulkWriteFilter) RecvMsg(m interface{}) error {
 		}
 	}
 }
+
+type BulkWriteRawFilter struct {
+	SS     grpc.ServerStream
+	User   string
+	Access Access
+}
+
+func (bw *BulkWriteRawFilter) SetHeader(m metadata.MD) error {
+	return bw.SS.SendHeader(m)
+}
+
+func (bw *BulkWriteRawFilter) SendHeader(m metadata.MD) error {
+	return bw.SS.SendHeader(m)
+}
+
+func (bw *BulkWriteRawFilter) SetTrailer(m metadata.MD) {
+	bw.SS.SetTrailer(m)
+}
+
+func (bw *BulkWriteRawFilter) Context() context.Context {
+	return bw.SS.Context()
+}
+
+func (bw *BulkWriteRawFilter) SendMsg(m interface{}) error {
+	return bw.SS.SendMsg(m)
+}
+
+func (bw *BulkWriteRawFilter) RecvMsg(m interface{}) error {
+	for {
+		var ge gripql.RawJson
+		err := bw.SS.RecvMsg(&ge)
+		if err != nil {
+			return err
+		}
+		err = bw.Access.Enforce(bw.User, ge.Graph, Write)
+		if err == nil {
+			mPtr := m.(*gripql.RawJson)
+			*mPtr = ge
+			return nil
+		} else {
+			log.Infof("Graph write error: %s", ge.Graph)
+		}
+	}
+}
diff --git a/accounts/interface.go b/accounts/interface.go
index 776aaed9..7f86438c 100644
--- a/accounts/interface.go
+++ b/accounts/interface.go
@@ -33,18 +33,20 @@ var MethodMap = map[string]Operation{
 	"/gripql.Job/ViewJob":    Read,
 	"/gripql.Job/ResumeJob":  Exec,
 
-	"/gripql.Edit/AddVertex":    Write,
-	"/gripql.Edit/AddEdge":      Write,
-	"/gripql.Edit/BulkAdd":      Write,
-	"/gripql.Edit/BulkDelete":   Write,
-	"/gripql.Edit/AddGraph":     Write,
-	"/gripql.Edit/DeleteGraph":  Write,
-	"/gripql.Edit/DeleteVertex": Write,
-	"/gripql.Edit/DeleteEdge":   Write,
-	"/gripql.Edit/AddIndex":     Write,
-	"/gripql.Edit/AddSchema":    Write,
-	"/gripql.Edit/AddMapping":   Write,
-	"/gripql.Edit/SampleSchema": Write, //Maybe exec?
+	"/gripql.Edit/AddVertex":     Write,
+	"/gripql.Edit/AddEdge":       Write,
+	"/gripql.Edit/BulkAdd":       Write,
+	"/gripql.Edit/BulkAddRaw":    Write,
+	"/gripql.Edit/BulkDelete":    Write,
+	"/gripql.Edit/AddGraph":      Write,
+	"/gripql.Edit/DeleteGraph":   Write,
+	"/gripql.Edit/DeleteVertex":  Write,
+	"/gripql.Edit/DeleteEdge":    Write,
+	"/gripql.Edit/AddIndex":      Write,
+	"/gripql.Edit/AddSchema":     Write,
+	"/gripql.Edit/AddJsonSchema": Write,
+	"/gripql.Edit/AddMapping":    Write,
+	"/gripql.Edit/SampleSchema":  Write, //Maybe exec?
 
 	"/gripql.Configure/StartPlugin": Admin,
 	"/gripql.Configure/ListPlugin":  Admin,
diff --git a/accounts/util.go b/accounts/util.go
index fe13b9cd..c70a5afd 100644
--- a/accounts/util.go
+++ b/accounts/util.go
@@ -143,6 +143,8 @@ func streamAuthInterceptor(auth Authenticate, access Access) grpc.StreamServerIn
 				return handler(srv, &BulkWriteFilter{ss, user, access})
 			} else if info.FullMethod == "/gripql.Edit/BulkDelete" {
 				return handler(srv, &BulkWriteFilter{ss, user, access})
+			} else if info.FullMethod == "/gripql.Edit/BulkAddRaw" {
+				return handler(srv, &BulkWriteRawFilter{ss, user, access})
 			} else {
 				log.Errorf("Unknown input streaming op %#v!!!", info)
 				return handler(srv, ss)
@@ -189,6 +191,9 @@ func getUnaryRequestGraph(req interface{}, info *grpc.UnaryServerInfo) (string,
 	case "/gripql.Edit/AddSchema", "/gripql.Edit/AddMapping":
 		o := req.(*gripql.Graph)
 		return o.Graph, nil
+	case "/gripql.Edit/AddJsonSchema":
+		o := req.(*gripql.RawJson)
+		return o.Graph, nil
 	case "/gripql.Edit/SampleSchema":
 		o := req.(*gripql.GraphID)
 		return o.Graph, nil
diff --git a/cmd/jsonload/main.go b/cmd/jsonload/main.go
new file mode 100644
index 00000000..1bf6ecb7
--- /dev/null
+++ b/cmd/jsonload/main.go
@@ -0,0 +1,88 @@
+package jsonload
+
+import (
+	"encoding/json"
+
+	"github.com/bmeg/grip/gripql"
+	"github.com/bmeg/grip/log"
+	"github.com/bmeg/grip/util"
+	"github.com/bmeg/grip/util/rpc"
+	"github.com/spf13/cobra"
+)
+
+var host = "localhost:8202"
+var NdJsonFile string
+var workerCount = 5
+var graph string
+var ExtraArgs string
+var logRate = 10000
+
+var Cmd = &cobra.Command{
+	Use:   "jsonload <NdJsonFile> <graph> <ExtraArgs>",
+	Short: "Load, Validate NdJson data into grip graph",
+	Long:  ``,
+	Args:  cobra.ExactArgs(3),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		NdJsonFile = args[0]
+		graph = args[1]
+		ExtraArgs = args[2]
+
+		var args_map map[string]any
+		if ExtraArgs != "" {
+			err := json.Unmarshal([]byte(ExtraArgs), &args_map)
+			if err != nil {
+				return err
+			}
+		}
+
+		conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true)
+		if err != nil {
+			return err
+		}
+		resp, err := conn.ListGraphs()
+		if err != nil {
+			return err
+		}
+		found := false
+		for _, g := range resp.Graphs {
+			if graph == g {
+				found = true
+			}
+		}
+		if !found {
+			log.WithFields(log.Fields{"graph": graph}).Info("creating graph")
+			err := conn.AddGraph(graph)
+			if err != nil {
+				return err
+			}
+		}
+		elemChan := make(chan *gripql.RawJson)
+		wait := make(chan bool)
+		go func() {
+			_, err := conn.BulkAddRaw(elemChan)
+			if err != nil {
+				log.Errorf("bulk add raw error: %v", err)
+			}
+			wait <- false
+		}()
+
+		jsonChan, err := util.StreamRawJsonFromFile(NdJsonFile, workerCount, graph, args_map)
+		if err != nil {
+			return err
+		}
+		count := 0
+		for j := range jsonChan {
+			count++
+			if count%logRate == 0 {
+				log.Infof("Loaded %d vertices", count)
+			}
+			elemChan <- j
+		}
+
+		close(elemChan)
+		<-wait
+
+		log.WithFields(log.Fields{"graph": graph}).Info("loading data")
+		return nil
+	},
+}
diff --git a/cmd/load/main.go b/cmd/load/main.go
index b2e18422..ec71c11e 100644
--- a/cmd/load/main.go
+++ b/cmd/load/main.go
@@ -6,6 +6,7 @@ import (
 	"github.com/bmeg/grip/cmd/load/example"
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
+	"github.com/bmeg/grip/schema"
 	"github.com/bmeg/grip/util"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/spf13/cobra"
@@ -153,7 +154,7 @@ var Cmd = &cobra.Command{
 
 		if jsonFile != "" {
 			log.Infof("Loading json file: %s", jsonFile)
-			graphs, err := gripql.ParseJSONGraphsFile(jsonFile)
+			graphs, err := schema.ParseJSONGraphsFile(jsonFile)
 			if err != nil {
 				return err
 			}
@@ -171,7 +172,7 @@ var Cmd = &cobra.Command{
 
 		if yamlFile != "" {
 			log.Infof("Loading YAML file: %s", yamlFile)
-			graphs, err := gripql.ParseYAMLGraphsFile(yamlFile)
+			graphs, err := schema.ParseYAMLGraphsFile(yamlFile)
 			if err != nil {
 				return err
 			}
diff --git a/cmd/mapping/main.go b/cmd/mapping/main.go
index f4e8605a..60dc7325 100644
--- a/cmd/mapping/main.go
+++ b/cmd/mapping/main.go
@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/bmeg/grip/gripql"
+	graphSchema "github.com/bmeg/grip/schema"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/spf13/cobra"
 )
@@ -43,9 +44,9 @@ var getCmd = &cobra.Command{
 
 		var txt string
 		if yaml {
-			txt, err = gripql.GraphToYAMLString(schema)
+			txt, err = graphSchema.GraphToYAMLString(schema)
 		} else {
-			txt, err = gripql.GraphToJSONString(schema)
+			txt, err = graphSchema.GraphToJSONString(schema)
 		}
 		if err != nil {
 			return err
@@ -78,9 +79,9 @@ var postCmd = &cobra.Command{
 				if err != nil {
 					return err
 				}
-				graphs, err = gripql.ParseJSONGraphs(bytes)
+				graphs, err = graphSchema.ParseJSONGraphs(bytes)
 			} else {
-				graphs, err = gripql.ParseJSONGraphsFile(jsonFile)
+				graphs, err = graphSchema.ParseJSONGraphsFile(jsonFile)
 			}
 			if err != nil {
 				return err
@@ -101,9 +102,9 @@ var postCmd = &cobra.Command{
 				if err != nil {
 					return err
 				}
-				graphs, err = gripql.ParseYAMLGraphs(bytes)
+				graphs, err = graphSchema.ParseYAMLGraphs(bytes)
 			} else {
-				graphs, err = gripql.ParseYAMLGraphsFile(yamlFile)
+				graphs, err = graphSchema.ParseYAMLGraphsFile(yamlFile)
 			}
 			if err != nil {
 				return err
diff --git a/cmd/root.go b/cmd/root.go
index 4ac259b2..b2a85c8d 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -13,6 +13,7 @@ import (
 	"github.com/bmeg/grip/cmd/erclient"
 	"github.com/bmeg/grip/cmd/info"
 	"github.com/bmeg/grip/cmd/job"
+	"github.com/bmeg/grip/cmd/jsonload"
 	"github.com/bmeg/grip/cmd/kvload"
 	"github.com/bmeg/grip/cmd/list"
 	"github.com/bmeg/grip/cmd/load"
@@ -60,6 +61,7 @@ func init() {
 	RootCmd.AddCommand(job.Cmd)
 	RootCmd.AddCommand(load.Cmd)
 	RootCmd.AddCommand(mongoload.Cmd)
+	RootCmd.AddCommand(jsonload.Cmd)
 	RootCmd.AddCommand(query.Cmd)
 	RootCmd.AddCommand(erclient.Cmd)
 	RootCmd.AddCommand(rdf.Cmd)
diff --git a/cmd/schema/main.go b/cmd/schema/main.go
index fb3c570d..a24e6aa0 100644
--- a/cmd/schema/main.go
+++ b/cmd/schema/main.go
@@ -6,8 +6,8 @@ import (
 	"os"
 
 	"github.com/bmeg/grip/gripql"
-	gripql_schema "github.com/bmeg/grip/gripql/schema"
 	"github.com/bmeg/grip/log"
+	"github.com/bmeg/grip/schema"
 	"github.com/bmeg/grip/util/rpc"
 	"github.com/spf13/cobra"
 )
@@ -16,10 +16,9 @@ var host = "localhost:8202"
 var yaml = false
 var jsonFile string
 var yamlFile string
-var sampleCount uint32 = 50
-var excludeLabels []string
-
-var manual bool
+var graphName string
+var jsonSchemaFile string
+var yamlSchemaPath string
 
 // Cmd line declaration
 var Cmd = &cobra.Command{
@@ -40,16 +39,16 @@ var getCmd = &cobra.Command{
 			return err
 		}
 
-		schema, err := conn.GetSchema(graph)
+		gripqlschema, err := conn.GetSchema(graph)
 		if err != nil {
 			return err
 		}
 
 		var txt string
 		if yaml {
-			txt, err = gripql.GraphToYAMLString(schema)
+			txt, err = schema.GraphToYAMLString(gripqlschema)
 		} else {
-			txt, err = gripql.GraphToJSONString(schema)
+			txt, err = schema.GraphToJSONString(gripqlschema)
 		}
 		if err != nil {
 			return err
@@ -59,13 +58,18 @@ var getCmd = &cobra.Command{
 	},
 }
 
+type Config struct {
+	DependencyOrder []string `yaml:"dependency_order"`
+}
+
 var postCmd = &cobra.Command{
-	Use:   "post",
-	Short: "Post graph schemas",
+	Use:   "post [graph name]",
+	Short: "Post jsonschema graph schemas",
 	Long:  ``,
-	Args:  cobra.NoArgs,
+	Args:  cobra.ExactArgs(1),
 	RunE: func(cmd *cobra.Command, args []string) error {
-		if jsonFile == "" && yamlFile == "" {
+		graphName := args[0]
+		if jsonFile == "" && yamlFile == "" && jsonSchemaFile == "" && yamlSchemaPath == "" {
 			return fmt.Errorf("no schema file was provided")
 		}
 
@@ -82,9 +86,9 @@ var postCmd = &cobra.Command{
 				if err != nil {
 					return err
 				}
-				graphs, err = gripql.ParseJSONGraphs(bytes)
+				graphs, err = schema.ParseJSONGraphs(bytes)
 			} else {
-				graphs, err = gripql.ParseJSONGraphsFile(jsonFile)
+				graphs, err = schema.ParseJSONGraphsFile(jsonFile)
 			}
 			if err != nil {
 				return err
@@ -106,9 +110,9 @@ var postCmd = &cobra.Command{
 				if err != nil {
 					return err
 				}
-				graphs, err = gripql.ParseYAMLGraphs(bytes)
+				graphs, err = schema.ParseYAMLGraphs(bytes)
 			} else {
-				graphs, err = gripql.ParseYAMLGraphsFile(yamlFile)
+				graphs, err = schema.ParseYAMLGraphsFile(yamlFile)
 			}
 			if err != nil {
 				return err
@@ -120,46 +124,34 @@ var postCmd = &cobra.Command{
 				}
 			}
 		}
-		return nil
-	},
-}
-
-var sampleCmd = &cobra.Command{
-	Use:   "sample <graph>",
-	Short: "Sample graph and construct schema",
-	Long:  ``,
-	Args:  cobra.ExactArgs(1),
-	RunE: func(cmd *cobra.Command, args []string) error {
-		graph := args[0]
-
-		conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true)
-		if err != nil {
-			return err
-		}
-
-		var schema *gripql.Graph
-		if manual {
-			schema, err = gripql_schema.ScanSchema(conn, graph, sampleCount, excludeLabels)
+		if jsonSchemaFile != "" {
+			log.Infof("Loading Json Schema file: %s", jsonSchemaFile)
+			graphs, err := schema.ParseJsonSchema(jsonSchemaFile, graphName)
 			if err != nil {
 				return err
 			}
-		} else {
-			schema, err = conn.SampleSchema(graph)
+			for _, g := range graphs {
+				err := conn.AddSchema(g)
+				if err != nil {
+					return err
+				}
+				log.Debug("Posted schema: %s", g.Graph)
+			}
+		}
+		if yamlSchemaPath != "" {
+			log.Infof("Loading Yaml Schema path: %s", yamlSchemaPath)
+			graphs, err := schema.ParseYamlSchemaPath(yamlSchemaPath, graphName)
 			if err != nil {
 				return err
 			}
+			for _, g := range graphs {
+				err := conn.AddSchema(g)
+				if err != nil {
+					return err
+				}
+				log.Debug("Posted schema: %s", g.Graph)
+			}
 		}
-		var txt string
-		if yaml {
-			txt, err = gripql.GraphToYAMLString(schema)
-		} else {
-			txt, err = gripql.GraphToJSONString(schema)
-		}
-		if err != nil {
-			return err
-		}
-		fmt.Printf("%s\n", txt)
-		conn.Close()
 		return nil
 	},
 }
@@ -173,15 +165,9 @@ func init() {
 	pflags.StringVar(&host, "host", host, "grip server url")
 	pflags.StringVar(&jsonFile, "json", "", "JSON graph file")
 	pflags.StringVar(&yamlFile, "yaml", "", "YAML graph file")
-
-	sflags := sampleCmd.Flags()
-	sflags.StringVar(&host, "host", host, "grip server url")
-	sflags.Uint32Var(&sampleCount, "sample", sampleCount, "Number of elements to sample")
-	sflags.BoolVar(&yaml, "yaml", yaml, "output schema in YAML rather than JSON format")
-	sflags.BoolVar(&manual, "manual", manual, "Use client side schema sampling")
-	sflags.StringSliceVar(&excludeLabels, "exclude-label", excludeLabels, "exclude vertex/edge label from schema")
+	pflags.StringVar(&jsonSchemaFile, "jsonSchema", "", "Json Schema")
+	pflags.StringVar(&yamlSchemaPath, "yamlSchemaPath", "", "Name of the dir that contains YAML schemas")
 
 	Cmd.AddCommand(getCmd)
 	Cmd.AddCommand(postCmd)
-	Cmd.AddCommand(sampleCmd)
 }
diff --git a/config/config.go b/config/config.go
index b5d6f119..db684f29 100644
--- a/config/config.go
+++ b/config/config.go
@@ -8,13 +8,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/bmeg/grip/elastic"
 	esql "github.com/bmeg/grip/existing-sql"
 	"github.com/bmeg/grip/gripper"
-	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/mongo"
 	"github.com/bmeg/grip/psql"
+	"github.com/bmeg/grip/schema"
 	"github.com/bmeg/grip/sqlite"
 	"github.com/bmeg/grip/util"
 	"github.com/bmeg/grip/util/duration"
@@ -27,17 +26,16 @@ func init() {
 }
 
 type DriverConfig struct {
-	Grids         *string
-	Badger        *string
-	Bolt          *string
-	Level         *string
-	Pebble        *string
-	Elasticsearch *elastic.Config
-	MongoDB       *mongo.Config
-	PSQL          *psql.Config
-	ExistingSQL   *esql.Config
-	Sqlite        *sqlite.Config
-	Gripper       *gripper.Config
+	Grids       *string
+	Badger      *string
+	Bolt        *string
+	Level       *string
+	Pebble      *string
+	MongoDB     *mongo.Config
+	PSQL        *psql.Config
+	ExistingSQL *esql.Config
+	Sqlite      *sqlite.Config
+	Gripper     *gripper.Config
 }
 
 // Config describes the configuration for Grip.
@@ -134,10 +132,6 @@ func TestifyConfig(c *Config) {
 	if d.MongoDB != nil {
 		d.MongoDB.DBName = "gripdb-" + rand
 	}
-	if d.Elasticsearch != nil {
-		d.Elasticsearch.DBName = "gripdb-" + rand
-		d.Elasticsearch.Synchronous = true
-	}
 	if d.Sqlite != nil {
 		d.Sqlite.DBName = "gripdb-" + rand
 	}
@@ -149,9 +143,6 @@ func (c *Config) SetDefaults() {
 		if d.MongoDB != nil {
 			d.MongoDB.SetDefaults()
 		}
-		if d.Elasticsearch != nil {
-			d.Elasticsearch.SetDefaults()
-		}
 	}
 }
 
@@ -211,7 +202,7 @@ func ParseConfigFile(relpath string, conf *Config) error {
 				if err != nil {
 					return fmt.Errorf("failed to parse config at path %s: \n%v", path, err)
 				}
-				graph, err := gripql.GraphMapToProto(data)
+				graph, err := schema.GraphMapToProto(data)
 				if err != nil {
 					return fmt.Errorf("failed to parse config at path %s: \n%v", path, err)
 				}
diff --git a/conformance/graphs/prompt-schema.json b/conformance/graphs/prompt-schema.json
new file mode 100644
index 00000000..4518b99c
--- /dev/null
+++ b/conformance/graphs/prompt-schema.json
@@ -0,0 +1,96 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "http://grip-schema.io/schema/0.0.1",
+    "$defs": {
+        "Prompt": {
+            "$id": "http://grip-schema.io/schema/0.0.1/Prompt",
+            "additionalProperties": false,
+            "description": "User generated prompt",
+            "links": [
+                {
+                    "href": "{id}",
+                    "rel": "responses",
+                    "targetHints": {
+                        "direction": [
+                            "outbound"
+                        ],
+                        "multiplicity": [
+                            "has_many"
+                        ],
+                        "regex_match": [
+                            "response:*"
+                        ]
+                    },
+                    "targetSchema": {
+                        "$ref": "http://grip-schema.io/schema/0.0.1/Response"
+                    },
+                    "templatePointers": {
+                        "id": "/response"
+                    }
+                }
+            ],
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "resourceType": {
+                    "type": "string"
+                },
+                "responses": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        },
+        "Response": {
+            "$id": "http://grip-schema.io/schema/0.0.1/Response",
+            "additionalProperties": false,
+            "description": "User LLM generated response",
+            "links": [
+                {
+                    "href": "{id}",
+                    "rel": "prompt",
+                    "targetHints": {
+                        "direction": [
+                            "outbound"
+                        ],
+                        "multiplicity": [
+                            "has_one"
+                        ],
+                        "regex_match": [
+                            "prompt:*"
+                        ]
+                    },
+                    "targetSchema": {
+                        "$ref": "http://grip-schema.io/schema/0.0.1/Prompt"
+                    },
+                    "templatePointers": {
+                        "id": "/prompt"
+                    }
+                }
+            ],
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "resourceType": {
+                    "type": "string"
+                },
+                "prompt": {
+                    "type": "string"
+                },
+                "model": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/conformance/graphs/prompt.yaml b/conformance/graphs/prompt.yaml
new file mode 100644
index 00000000..0f58c6f5
--- /dev/null
+++ b/conformance/graphs/prompt.yaml
@@ -0,0 +1,29 @@
+id: http://grip-schema.io/schema/0.0.1/Prompt
+additionalProperties: false
+description: User generated prompt
+links:
+- href: '{id}'
+  rel: responses
+  targetHints:
+    direction:
+    - outbound
+    multiplicity:
+    - has_many
+    regex_match:
+    - response:*
+  targetSchema:
+    $ref: http://grip-schema.io/schema/0.0.1/Response
+  templatePointers:
+    id: /response
+
+properties:
+  id:
+    type: string
+  text:
+    type: string
+  resourceType:
+    type: string
+  responses:
+    type: array
+    items:
+      type: string
diff --git a/conformance/graphs/response.yaml b/conformance/graphs/response.yaml
new file mode 100644
index 00000000..311ef2c5
--- /dev/null
+++ b/conformance/graphs/response.yaml
@@ -0,0 +1,30 @@
+id: http://grip-schema.io/schema/0.0.1/Response
+additionalProperties: false
+description: User LLM generated response
+links:
+- href: '{id}'
+  rel: prompt
+  targetHints:
+    direction:
+    - outbound
+    multiplicity:
+    - has_one
+    regex_match:
+    - prompt:*
+  targetSchema:
+    $ref: http://grip-schema.io/schema/0.0.1/Prompt
+  templatePointers:
+    id: /prompt
+
+properties:
+  id:
+    type: string
+  text:
+    type: string
+  resourceType:
+    type: string
+  prompt:
+    type: string
+  model:
+    type: string
+
diff --git a/conformance/tests/ot_bulk_raw.py b/conformance/tests/ot_bulk_raw.py
new file mode 100644
index 00000000..e98afdc3
--- /dev/null
+++ b/conformance/tests/ot_bulk_raw.py
@@ -0,0 +1,72 @@
+import json
+
+def load_json_schema(path):
+    with open(path, 'r') as file:
+        content = file.read()
+        return json.loads(content)
+
+
+def test_bulk_add_raw(man):
+    errors = []
+
+    G = man.writeTest()
+    G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json"))
+
+    fetchedSchema = G.getSchema()
+    len_vertices = len(fetchedSchema['vertices'])
+    if len_vertices != 2:
+        errors.append(f"incorrect number of vertices in schema {len_vertices} != 2")
+
+    bulkRaw = G.bulkAddRaw()
+    bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders.        Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]})
+    bulkRaw.addJson(data={"id": "prompt:1", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]})
+    bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"})
+    bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"})
+    err = bulkRaw.execute()
+
+    if err["insertCount"] != 4:
+        errors.append(f"Wrong number of inserted vertices {err['insertCount']} != 4")
+    if len(err["errors"]) != 0:
+        errors.append(f"Wrong number of errors {len(err['errors'])} != 0")
+
+    vertex = G.getVertex("prompt:0")['data']['responses']
+    if vertex != ['response:0']:
+        errors.append("prompt:0 responses != ['response:0']")
+
+    labels = G.listLabels()
+    if not all(item in labels['vertexLabels'] for item in ['Prompt', 'Response']):
+        errors.append(f"After insert operations {labels} != expected {{'vertexLabels': ['Condition', 'Patient']}}")
+
+    return errors
+
+
+
+def test_bulk_add_raw_validation_error(man):
+    errors = []
+    G = man.writeTest()
+    G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json"))
+
+    bulkRaw = G.bulkAddRaw()
+    bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders.        Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]})
+    bulkRaw.addJson(data={"id": ["prompt:1"], "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]})
+    bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"})
+    bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"})
+
+    err = bulkRaw.execute()
+    if err['insertCount'] != 3 or len(err['errors']) != 1:
+        errors.append(f"validation error causes -1 insertCount +1 error: {err['insertCount']} != 3 or {len(err['errors'])} != 1")
+
+    return errors
+
+
+def test_bulk_add_raw_no_schema(man):
+    errors = []
+
+    G = man.writeTest()
+    bulkRaw = G.bulkAddRaw()
+    bulkRaw.addJson(data={"category":[{"coding":[{"code":"encounter-diagnosis","display":"Encounter Diagnosis","system":"http://terminology.hl7.org/CodeSystem/condition-category"}]}],"clinicalStatus":{"coding":[{"code":"active","system":"http://terminology.hl7.org/CodeSystem/condition-clinical"}]},"code":{"coding":[{"code":"230690007","display":"Stroke","system":"http://snomed.info/sct"}],"text":"Stroke"},"encounter":{"reference":"Encounter/f78a1442-683a-4ea2-adca-161902be19cb"},"id":"838e42fb-a65d-4039-9f83-59c37b1ae889","links":[{"href":"Patient/45c11dad-2b38-4c8e-822e-7abff8a1ee1d","rel":"subject_Patient"}],"meta":{"lastUpdated":"2023-01-26T14:21:56.658+00:00","profile":["http://hl7.org/fhir/us/core/StructureDefinition/us-core-condition"],"source":"#DmW9sueQ4yuQdyA9","versionId":"1"},"onsetDateTime":"2013-08-24T15:40:53-04:00","recordedDate":"2013-08-24T15:40:53-04:00","resourceType":"Condition","subject":{"reference":"Patient/45c11dad-2b38-4c8e-822e-7abff8a1ee1d"},"verificationStatus":{"coding":[{"code":"confirmed","system":"http://terminology.hl7.org/CodeSystem/condition-ver-status"}]}})
+    err = bulkRaw.execute()
+    if len(err["errors"]) != 1:
+        errors.append("No schema was provided so error count should equal 1")
+
+    return []
diff --git a/conformance/tests/ot_bulk_raw_yaml.py b/conformance/tests/ot_bulk_raw_yaml.py
new file mode 100644
index 00000000..bc40a17b
--- /dev/null
+++ b/conformance/tests/ot_bulk_raw_yaml.py
@@ -0,0 +1,42 @@
+import json
+import yaml
+
+def test_post_yaml_schema(man):
+    errors = []
+    G = man.writeTest()
+
+    prompt = process_graph_schema("conformance/graphs/prompt.yaml")
+    response = process_graph_schema("conformance/graphs/response.yaml")
+
+    G.addSchema(vertices=prompt)
+    G.addSchema(vertices=response)
+
+    fetchedSchema = G.getSchema()
+    len_vertices = len(fetchedSchema['vertices'])
+    if len_vertices != 2:
+        errors.append(f"incorrect number of vertices in schema {len_vertices} != 2")
+
+    bulkRaw = G.bulkAddRaw()
+    bulkRaw.addJson(data={"id": "prompt:0", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nInhibition of rat brain monoamine oxidase activities by psoralen and isopsoralen: implications for the treatment of affective disorders.        Psoralen and isopsoralen, furocoumarins isolated from the plant Psoralea corylifolia L., were demonstrated to exhibit in vitro inhibitory actions on monoamine oxidase (MAO) activities in rat brain mitochondria, preferentially inhibiting MAO-A activity over MAO-B activity. This inhibition of enzyme activities was found to be dose-dependent and reversible. For MAO-A, the IC50 values are 15.2 +/- 1.3 microM psoralen and 9.0 +/- 0.6 microM isopsoralen. For MAO-B, the IC50 values are 61.8 +/- 4.3 microM psoralen and 12.8 +/- 0.5 microM isopsoralen. Lineweaver-Burk transformation of the inhibition data indicates that inhibition by both psoralen and isopsoralen is non-competitive for MAO-A. The Ki values were calculated to be 14.0 microM for psoralen and 6.5 microM for isopsoralen. On the other hand, inhibition by both psoralen and isopsoralen is competitive for MAO-B. The Ki values were calculated to be 58.1 microM for psoralen and 10.8 microM for isopsoralen. These inhibitory actions of psoralen and isopsoralen on rat brain mitochondrial MAO activities are discussed in relation to their toxicities and their potential applications to treat affective disorders.\n", "responses": ["response:0"]})
+    bulkRaw.addJson(data={"id": "prompt:1", "resourceType":"Prompt", "text": "Identify the drug-target interactions in the passage given below (along with the interaction type among the following: 'inhibitor', 'agonist', 'modulator', 'activator', 'blocker', 'inducer', 'antagonist', 'cleavage', 'disruption', 'intercalation', 'inactivator', 'bind', 'binder', 'partial agonist', 'cofactor', 'substrate', 'ligand', 'chelator', 'downregulator', 'other', 'antibody', 'other/unknown'):\n\nSelective inhibitor of Janus tyrosine kinase 3, PNU156804, prolongs allograft survival and acts synergistically with cyclosporine but additively with rapamycin.\tJanus kinase 3 (Jak3) is a cytoplasmic tyrosine (Tyr) kinase associated with the interleukin-2 (IL-2) receptor common gamma chain (gamma(c)) that is activated by multiple T-cell growth factors (TCGFs) such as IL-2, -4, and -7. Using human T cells, it was found that a recently discovered variant of the undecylprodigiosin family of antibiotics, PNU156804, previously shown to inhibit IL-2-induced cell proliferation, also blocks IL-2-mediated Jak3 auto-tyrosine phosphorylation, activation of Jak3 substrates signal transducers and activators of transcription (Stat) 5a and Stat5b, and extracellular regulated kinase 1 (Erk1) and Erk2 (p44/p42). Although PNU156804 displayed similar efficacy in blocking Jak3-dependent T-cell proliferation by IL-2, -4, -7, or -15, it was more than 2-fold less effective in blocking Jak2-mediated cell growth, its most homologous Jak family member. A 14-day alternate-day oral gavage with 40 to 120 mg/kg PNU156804 extended the survival of heart allografts in a dose-dependent fashion. In vivo, PNU156804 acted synergistically with the signal 1 inhibitor cyclosporine A (CsA) and additively with the signal 3 inhibitor rapamycin to block allograft rejection. It is concluded that inhibition of signal 3 alone by targeting Jak3 in combination with a signal 1 inhibitor provides a unique strategy to achieve potent immunosuppression.\n", "responses": ["response:1"]})
+    bulkRaw.addJson(data={"id": "response:0", "resourceType":"Response", "text": "\n\nDrug: Psoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor\n\nDrug: Isopsoralen\nTarget: Monoamine oxidase (MAO)\nInteraction Type: Inhibitor", "prompt": "prompt:0"})
+    bulkRaw.addJson(data={"id": "response:1", "resourceType":"Response", "text": "\n\nDrug-target interactions:\n- PNU156804: inhibitor of Jak3\n- Cyclosporine A: signal 1 inhibitor\n- Rapamycin: signal 3 inhibitor\n\nInteraction types:\n- PNU156804: inhibitor\n- Cyclosporine A: inhibitor\n- Rapamycin: inhibitor/signal transduction inhibitor (exact interaction type not specified in the passage)", "prompt": "prompt:1"})
+    err = bulkRaw.execute()
+
+    if err["insertCount"] != 4:
+        errors.append(f"Wrong number of inserted vertices {err['insertCount']} != 4")
+    if len(err["errors"]) != 0:
+        errors.append(f"Wrong number of errors {len(err['errors'])} != 0")
+
+    vertex = G.getVertex("prompt:0")['data']['responses']
+    if vertex != ['response:0']:
+        errors.append("prompt:0 responses != ['response:0']")
+
+    return errors
+
+def process_graph_schema(path):
+    with open(path, 'r') as file:
+        content = file.read()
+        vertex = yaml.safe_load(content)
+        id = vertex["id"].split("/")[-1]
+    return [{"data":vertex, "label": id, "gid": vertex["id"] }]
diff --git a/conformance/tests/ot_schema.py b/conformance/tests/ot_schema.py
index 2493a9f0..18ae04fa 100644
--- a/conformance/tests/ot_schema.py
+++ b/conformance/tests/ot_schema.py
@@ -1,4 +1,5 @@
 
+import json
 
 def test_getscheama(man):
     errors = []
@@ -26,5 +27,25 @@ def test_getscheama(man):
         errors.append("Incorrect labels returned from sampling: %s != %s " %
             (eLabels, eExpectedLabels)
         )
+    return errors
+
+
+def test_post_json_schema(man):
+    errors = []
+    G = man.setGraph("swapi")
+    G.addJsonSchema(load_json_schema("conformance/graphs/prompt-schema.json"))
+    fetched_schema = G.getSchema()
+    len_vertices = len(fetched_schema['vertices'])
+    if len_vertices != 2:
+        errors.append(f"incorrect number of vertices in schema {len_vertices} != 2")
+    len_edges = len(fetched_schema['edges'])
+    if len_edges != 0:
+        errors.append(f"incorrect number of edges in schema {len_vertices} != 0")
 
     return errors
+
+
+def load_json_schema(path):
+    with open(path, 'r') as file:
+        content = file.read()
+        return json.loads(content)
diff --git a/conformance/tests/ot_transform.py b/conformance/tests/ot_transform.py
index f3c9fdc4..77c385fe 100644
--- a/conformance/tests/ot_transform.py
+++ b/conformance/tests/ot_transform.py
@@ -1,4 +1,5 @@
 
+from re import I
 import gripql
 
 def test_count(man):
@@ -8,6 +9,7 @@ def test_count(man):
 
     q = G.query().V().hasLabel("Planet").unwind("terrain").aggregate(gripql.term("t", "terrain"))
     count = 0
+
     for row in q:
         if row['key'] not in ['rainforests', 'desert', 'mountains', 'jungle', 'rainforests', 'grasslands']:
             errors.append("Incorrect value %s returned" % row['key'])
@@ -19,3 +21,28 @@ def test_count(man):
         errors.append("Incorrect # elements returned")
 
     return errors
+
+
+def test_unwind(man):
+    errors = []
+    G = man.writeTest()
+    bulk = G.bulkAdd()
+    bulk.addVertex("1", "Observation", {"resourceType": "Observation", "id": "e87cecef-c91d-3861-a35e-6eaed41580c8", "status": "final", "category": [{"coding": [{"system": "http://terminology.hl7.org/CodeSystem/observation-category", "code": "laboratory", "display": "laboratory"}]}], "code": {"coding": [{"system": "http://loinc.org", "code": "81247-9", "display": "Master HL7 genetic variant reporting panel"}]}, "subject": {"reference": "Patient/ac0d7a82-82cb-4aec-b859-e37375f3de8b"}, "specimen": {"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}, "focus": [{"reference": "Specimen/dc48f578-193c-4740-93f3-61a78e3c6ba0"}], "effectiveDateTime": "2024-06-03T08:00:00+00:00", "valueString": "Sequencing parameters", "component": [{"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "concentration", "display": "concentration"}], "text": "concentration"}, "valueQuantity": {"value": 0.16}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_quantity", "display": "aliquot_quantity"}], "text": "aliquot_quantity"}, "valueQuantity": {"value": 2.13}}, {"code": {"coding": [{"system": "https://cadsr.cancer.gov/sample_laboratory_observation", "code": "aliquot_volume", "display": "aliquot_volume"}], "text": "aliquot_volume"}, "valueQuantity": {"value": 13.3}}]})
+    err = bulk.execute()
+
+    q = G.query().V().hasLabel("Observation").unwind("component")
+    count = 0
+    for row in q:
+        #print("ROW: ", row)
+        count +=1
+    if count != 3:
+        errors.append("There should be 3 vertices after unwind process")
+
+    q = G.query().V().hasLabel("Observation").unwind("component").has(gripql.gt("component.valueQuantity.value", 1))
+    count = 0
+    for r in q:
+        count +=1
+    if count != 2:
+        errors.append("There should be 2 vertices after unwind process and filter")
+
+    return errors
diff --git a/docs/categories/index.xml b/docs/categories/index.xml
index bb6d02fd..8f7de393 100644
--- a/docs/categories/index.xml
+++ b/docs/categories/index.xml
@@ -4,11 +4,8 @@
     <title>Categories on GRIP</title>
     <link>https://bmeg.github.io/grip/categories/</link>
     <description>Recent content in Categories on GRIP</description>
-    <generator>Hugo -- gohugo.io</generator>
+    <generator>Hugo</generator>
     <language>en-us</language>
-    
-	<atom:link href="https://bmeg.github.io/grip/categories/index.xml" rel="self" type="application/rss+xml" />
-    
-    
+    <atom:link href="https://bmeg.github.io/grip/categories/index.xml" rel="self" type="application/rss+xml" />
   </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/docs/docs/commands/drop/index.html b/docs/docs/commands/drop/index.html
index 5401498c..6f949ce1 100644
--- a/docs/docs/commands/drop/index.html
+++ b/docs/docs/commands/drop/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,7 +355,7 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip drop &lt;graph&gt;
+    <pre tabindex="0"><code>grip drop &lt;graph&gt;
 </code></pre><p>Deletes a graph.</p>
 
   </div>
diff --git a/docs/docs/commands/er/index.html b/docs/docs/commands/er/index.html
index 40481c11..99fd7c2b 100644
--- a/docs/docs/commands/er/index.html
+++ b/docs/docs/commands/er/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,24 +355,24 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip er
+    <pre tabindex="0"><code>grip er
 </code></pre><p>The <em>External Resource</em> system allows GRIP to plug into existing data systems and
 integrate them into queriable graphs. The <code>grip er</code> sub command acts as a client
 to the external resource plugin proxies, issues command and displays the results.
 This is often useful for debugging external resources before making them part of
 an actual graph.</p>
 <p>List collections provided by external resource</p>
-<pre><code>grip er list
+<pre tabindex="0"><code>grip er list
 </code></pre><p>Get info about a collection</p>
-<pre><code>grip er info
+<pre tabindex="0"><code>grip er info
 </code></pre><p>List ids from a collection</p>
-<pre><code>grip er ids
+<pre tabindex="0"><code>grip er ids
 </code></pre><p>List rows from a collection</p>
-<pre><code>grip er rows
+<pre tabindex="0"><code>grip er rows
 </code></pre><p>List rows with field match</p>
-<pre><code>grip get
+<pre tabindex="0"><code>grip get
 </code></pre><p>List rows with field match</p>
-<pre><code>grip er query
+<pre tabindex="0"><code>grip er query
 </code></pre>
   </div>
 
diff --git a/docs/docs/commands/index.html b/docs/docs/commands/index.html
index 39c19c9d..6adba192 100644
--- a/docs/docs/commands/index.html
+++ b/docs/docs/commands/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/commands/list/index.html b/docs/docs/commands/list/index.html
index efcaa637..a1df2e7e 100644
--- a/docs/docs/commands/list/index.html
+++ b/docs/docs/commands/list/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,9 +355,9 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip list
+    <pre tabindex="0"><code>grip list
 </code></pre><h1 id="graphs">graphs</h1>
-<pre><code>grip list graphs
+<pre tabindex="0"><code>grip list graphs
 </code></pre>
   </div>
 
diff --git a/docs/docs/commands/mongoload/index.html b/docs/docs/commands/mongoload/index.html
index b47faf9b..a0b96032 100644
--- a/docs/docs/commands/mongoload/index.html
+++ b/docs/docs/commands/mongoload/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,7 +355,7 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip mongoload
+    <pre tabindex="0"><code>grip mongoload
 </code></pre>
   </div>
 
diff --git a/docs/docs/commands/query/index.html b/docs/docs/commands/query/index.html
index b9f36c8f..b8f62df7 100644
--- a/docs/docs/commands/query/index.html
+++ b/docs/docs/commands/query/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,7 +355,7 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip query &lt;graph&gt; &lt;query&gt;
+    <pre tabindex="0"><code>grip query &lt;graph&gt; &lt;query&gt;
 </code></pre><p>Run a query on a graph.</p>
 
   </div>
diff --git a/docs/docs/commands/server/index.html b/docs/docs/commands/server/index.html
index f61c724d..5d12a98f 100644
--- a/docs/docs/commands/server/index.html
+++ b/docs/docs/commands/server/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -355,7 +355,7 @@
   </div>
 
   <div class="main col span_8_of_12">
-    <pre><code>grip server
+    <pre tabindex="0"><code>grip server
 </code></pre><p>The server command starts up a graph server and waits for incoming requests.</p>
 <h2 id="default-configuration">Default Configuration</h2>
 <p>If invoked with no arguments or config files, GRIP will start up in embedded mode,
diff --git a/docs/docs/databases/elastic/index.html b/docs/docs/databases/elastic/index.html
deleted file mode 100644
index 4badd322..00000000
--- a/docs/docs/databases/elastic/index.html
+++ /dev/null
@@ -1,375 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-<head>
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-  
-  <title>Elasticsearch &middot; GRIP</title>
-  
-
-  
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/poole.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/darcula.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/syntax.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/theme.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/funnel.css">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700">
-
-  
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://bmeg.github.io/grip/apple-touch-icon-144-precomposed.png">
-  <link rel="shortcut icon" href="https://bmeg.github.io/grip/favicon.png">
-
-  <script src="https://bmeg.github.io/grip/js/highlight.pack.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
-
-</head>
-<body>
-
-  <div class="global-header">
-    <div class="global-header-container">
-      <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
-      </div>
-      <ul class="global-header-nav">
-          <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
-          <li><a href="https://bmeg.github.io/grip/docs/">Docs</a></li>
-          <li><a href="https://github.com/bmeg/grip">GitHub</a></li>
-          <li><a href="https://gitter.im/bmeg/grip">Chat</a></li>
-        </ul>
-      <div class="global-header-ohsucb">
-        <a href="https://www.ohsu.edu/compbio/"><h2>OHSU Comp Bio</h2></a>
-      </div>
-    </div>
-  </div>
-
-
-<div class="content section group">
-
-  <div class="sidebar col span_3_of_12">
-    <ul class="sidebar-nav">
-      
-      
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/docs/"
-             class="sidebar-nav-item "
-          >Overview</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/download/"
-             class="sidebar-nav-item "
-          >Download</a></li>
-          
-        
-        <li>
-          
-          <span class="intermediate">GRIP Commands</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/server/"
-                   class="sidebar-nav-item "
-                >server</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/query/"
-                   class="sidebar-nav-item "
-                >query</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/list/"
-                   class="sidebar-nav-item "
-                >list</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/drop/"
-                   class="sidebar-nav-item "
-                >drop</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/mongoload/"
-                   class="sidebar-nav-item "
-                >mongoload</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/commands/er/"
-                   class="sidebar-nav-item "
-                >er</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Database Configuration</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item  active"
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/kvstore/"
-                   class="sidebar-nav-item "
-                >Embedded KV Store</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/mongo/"
-                   class="sidebar-nav-item "
-                >MongoDB</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/psql/"
-                   class="sidebar-nav-item "
-                >PostgreSQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/sql/"
-                   class="sidebar-nav-item "
-                >SQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/gripper/"
-                   class="sidebar-nav-item "
-                >GRIPPER</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">GRIP Plugable External Resources</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/gripper/"
-                   class="sidebar-nav-item "
-                >Intro</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/proxy/"
-                   class="sidebar-nav-item "
-                >External Resource Proxies</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/graphmodel/"
-                   class="sidebar-nav-item "
-                >Graph Model</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Query a Graph</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/getting_started/"
-                   class="sidebar-nav-item "
-                >Getting Started</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/operations/"
-                   class="sidebar-nav-item "
-                >Operations</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/jsonpath/"
-                   class="sidebar-nav-item "
-                >Referencing Fields</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/jobs_api/"
-                   class="sidebar-nav-item "
-                >Jobs API</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Tutorials</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/amazon/"
-                   class="sidebar-nav-item "
-                >Amazon Purchase Network</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/tcga-rna/"
-                   class="sidebar-nav-item "
-                >TCGA RNA Expression</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Security</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/security/basic/"
-                   class="sidebar-nav-item "
-                >Basic Auth</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">GraphQL</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/graphql/graphql/"
-                   class="sidebar-nav-item "
-                >GraphQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/graphql/graph_schemas/"
-                   class="sidebar-nav-item "
-                >Graph Schemas</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Developers</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://github.com/bmeg/grip/blob/master/gripql/gripql.proto"
-                   class="sidebar-nav-item "
-                >API</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://godoc.org/github.com/bmeg/grip"
-                   class="sidebar-nav-item "
-                >GoDoc</a></li>
-            </ul>
-          </li>
-          
-          
-        
-      
-    </ul>
-  </div>
-
-  <div class="main col span_8_of_12">
-    <h1 id="elasticsearch">Elasticsearch</h1>
-<p>GRIP supports storing vertices and edges in <a href="https://www.elastic.co/">Elasticsearch</a>.</p>
-<p>Config:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Default: elastic
-
-Drivers:
-  elastic:
-    Elasticsearch:
-      URL: <span style="color:#e6db74">&#34;http://localhost:9200&#34;</span>
-      DBName: <span style="color:#e6db74">&#34;gripdb&#34;</span>
-      Username: <span style="color:#e6db74">&#34;&#34;</span>
-      Password: <span style="color:#e6db74">&#34;&#34;</span>
-</code></pre></div>
-  </div>
-
-</div>
-</body>
-</html>
diff --git a/docs/docs/databases/gripper/index.html b/docs/docs/databases/gripper/index.html
index c4e6d2b6..b39fd7c9 100644
--- a/docs/docs/databases/gripper/index.html
+++ b/docs/docs/databases/gripper/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -359,12 +359,12 @@ <h1 id="gripper">GRIPPER</h1>
 <p>GRIP Plugable External Resources are data systems that GRIP can combine together
 to create graphs.</p>
 <p>Example:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Drivers:
-  swapi-driver:
-    Gripper:
-      ConfigFile: ./swapi.yaml
-      Graph: swapi
-</code></pre></div><p><code>ConfigFile</code> - Path to GRIPPER graph map</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Drivers</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">swapi-driver</span>:
+</span></span><span style="display:flex;"><span>    <span style="color:#f92672">Gripper</span>:
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">ConfigFile</span>: <span style="color:#ae81ff">./swapi.yaml</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Graph</span>: <span style="color:#ae81ff">swapi</span>
+</span></span></code></pre></div><p><code>ConfigFile</code> - Path to GRIPPER graph map</p>
 <p><code>Graph</code> - Name of the graph for the mapped external resources.</p>
 
   </div>
diff --git a/docs/docs/databases/index.html b/docs/docs/databases/index.html
index 215fb562..19d99beb 100644
--- a/docs/docs/databases/index.html
+++ b/docs/docs/databases/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/databases/kvstore/index.html b/docs/docs/databases/kvstore/index.html
index 5158a5ff..25bb6f44 100644
--- a/docs/docs/databases/kvstore/index.html
+++ b/docs/docs/databases/kvstore/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -363,12 +363,12 @@ <h1 id="embedded-key-value-stores">Embedded Key Value Stores</h1>
 <li><a href="https://github.com/syndtr/goleveldb">LevelDB</a></li>
 </ul>
 <p>Config:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Default: kv
-
-Driver:
-  kv:
-    Badger: grip.db
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Default</span>: <span style="color:#ae81ff">kv</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">Driver</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">kv</span>:
+</span></span><span style="display:flex;"><span>    <span style="color:#f92672">Badger</span>: <span style="color:#ae81ff">grip.db</span>
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/databases/mongo/index.html b/docs/docs/databases/mongo/index.html
index 0a61860b..e7149c16 100644
--- a/docs/docs/databases/mongo/index.html
+++ b/docs/docs/databases/mongo/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -358,18 +358,18 @@
     <h1 id="mongodb">MongoDB</h1>
 <p>GRIP supports storing vertices and edges in <a href="https://www.mongodb.com/">MongoDB</a>.</p>
 <p>Config:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Default: mongo
-
-Drivers:
-  mongo:
-    MongoDB:
-      URL: <span style="color:#e6db74">&#34;mongodb://localhost:27000&#34;</span>
-      DBName: <span style="color:#e6db74">&#34;gripdb&#34;</span>
-      Username: <span style="color:#e6db74">&#34;&#34;</span>
-      Password: <span style="color:#e6db74">&#34;&#34;</span>
-      UseCorePipeline: False
-      BatchSize: <span style="color:#ae81ff">0</span>
-</code></pre></div><p><code>UseCorePipeline</code> - Default is to use Mongo pipeline API to do graph traversals.
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Default</span>: <span style="color:#ae81ff">mongo</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">Drivers</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">mongo</span>:
+</span></span><span style="display:flex;"><span>    <span style="color:#f92672">MongoDB</span>:
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">URL</span>: <span style="color:#e6db74">&#34;mongodb://localhost:27000&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">DBName</span>: <span style="color:#e6db74">&#34;gripdb&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Username</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Password</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">UseCorePipeline</span>: <span style="color:#66d9ef">False</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">BatchSize</span>: <span style="color:#ae81ff">0</span>
+</span></span></code></pre></div><p><code>UseCorePipeline</code> - Default is to use Mongo pipeline API to do graph traversals.
 By enabling <code>UseCorePipeline</code>, GRIP will do the traversal logic itself, only using
 Mongo for graph storage.</p>
 <p><code>BatchSize</code> - For core engine operations, GRIP dispatches element lookups in
diff --git a/docs/docs/databases/psql/index.html b/docs/docs/databases/psql/index.html
index f1976d00..dec895f6 100644
--- a/docs/docs/databases/psql/index.html
+++ b/docs/docs/databases/psql/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -358,18 +358,18 @@
     <h1 id="postgresql">PostgreSQL</h1>
 <p>GRIP supports storing vertices and edges in <a href="https://www.postgresql.org/">PostgreSQL</a>.</p>
 <p>Config:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Default: psql
-
-Drivers:
-  psql:
-    PSQL:
-      Host: localhost
-      Port: <span style="color:#ae81ff">15432</span>
-      User: <span style="color:#e6db74">&#34;&#34;</span>
-      Password: <span style="color:#e6db74">&#34;&#34;</span>
-      DBName: <span style="color:#e6db74">&#34;grip&#34;</span>
-      SSLMode: disable
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Default</span>: <span style="color:#ae81ff">psql</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">Drivers</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">psql</span>:
+</span></span><span style="display:flex;"><span>    <span style="color:#f92672">PSQL</span>:
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Host</span>: <span style="color:#ae81ff">localhost</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Port</span>: <span style="color:#ae81ff">15432</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">User</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Password</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">DBName</span>: <span style="color:#e6db74">&#34;grip&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">SSLMode</span>: <span style="color:#ae81ff">disable</span>
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/databases/sql/index.html b/docs/docs/databases/sql/index.html
index 315793bd..ab039bf6 100644
--- a/docs/docs/databases/sql/index.html
+++ b/docs/docs/databases/sql/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -359,7 +359,7 @@ <h1 id="connect-to-an-existing-sql-database">Connect to an existing SQL database
 <p>Note: This driver is being superseded by the <a href="https://bmeg.github.io/grip/docs/gripper/gripper/">GRIPPER engine</a></p>
 <p>GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against <a href="https://www.postgresql.org/">PostgreSQL</a>, but should  work with
 <a href="https://www.mysql.com/">MySQL</a> (4.1+) and <a href="https://mariadb.org/">MariaDB</a>.</p>
-<p>Since GRIP uses Go's <code>database/sql</code> package, we could (in thoery) support any SQL databases listed on:
+<p>Since GRIP uses Go&rsquo;s <code>database/sql</code> package, we could (in thoery) support any SQL databases listed on:
 <a href="https://github.com/golang/go/wiki/SQLDrivers">https://github.com/golang/go/wiki/SQLDrivers</a>. Open an <a href="https://github.com/bmeg/grip/issues/new">issue</a> if you
 would like to request support for your favorite SQL database.</p>
 <h2 id="configuration-notes">Configuration Notes</h2>
@@ -389,56 +389,56 @@ <h2 id="configuration-notes">Configuration Notes</h2>
 <h2 id="example">Example</h2>
 <p>Given the following example database: <a href="https://github.com/bmeg/grip/blob/master/test/resources/postgres_smtest_data.dump">https://github.com/bmeg/grip/blob/master/test/resources/postgres_smtest_data.dump</a></p>
 <p>Load this dump file into your own postgres instance by running:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">createdb --host localhost --port <span style="color:#ae81ff">15432</span> -U postgres smtest
-psql --host localhost --port <span style="color:#ae81ff">15432</span> -U postgres smtest &lt; postgres_smtest_data.dump
-</code></pre></div><p>GRIP Configuration:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">
-Drivers:
-  esql:
-    ExistingSQL:
-      DataSourceName: <span style="color:#e6db74">&#34;host=localhost port=15432 user=postgres dbname=smtest sslmode=disable&#34;</span>
-      Driver: postgres
-
-      Graphs:
-        - Graph: test-graph
-          Vertices:
-            - Table: users
-              Label: users
-              GidField: id
-
-            - Table: products
-              Label: products
-              GidField: id
-
-            - Table: purchases
-              Label: purchases
-              GidField: id
-
-          Edges:
-            - Table: purchase_items
-              Label: purchasedProducts
-              GidField: id
-              From:
-                SourceField: purchase_id
-                DestTable: purchases
-                DestField: id
-              To:
-                SourceField: product_id
-                DestTable: products
-                DestField: id
-
-            - Table: <span style="color:#e6db74">&#34;&#34;</span>
-              Label: userPurchases          
-              GidField: <span style="color:#e6db74">&#34;&#34;</span>
-              From:
-                SourceField: <span style="color:#e6db74">&#34;&#34;</span>
-                DestTable: users
-                DestField: id
-              To:
-                SourceField: <span style="color:#e6db74">&#34;&#34;</span>
-                DestTable: purchases
-                DestField: user_id
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>createdb --host localhost --port <span style="color:#ae81ff">15432</span> -U postgres smtest
+</span></span><span style="display:flex;"><span>psql --host localhost --port <span style="color:#ae81ff">15432</span> -U postgres smtest &lt; postgres_smtest_data.dump
+</span></span></code></pre></div><p>GRIP Configuration:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">Drivers</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">esql</span>:
+</span></span><span style="display:flex;"><span>    <span style="color:#f92672">ExistingSQL</span>:
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">DataSourceName</span>: <span style="color:#e6db74">&#34;host=localhost port=15432 user=postgres dbname=smtest sslmode=disable&#34;</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Driver</span>: <span style="color:#ae81ff">postgres</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Graphs</span>:
+</span></span><span style="display:flex;"><span>        - <span style="color:#f92672">Graph</span>: <span style="color:#ae81ff">test-graph</span>
+</span></span><span style="display:flex;"><span>          <span style="color:#f92672">Vertices</span>:
+</span></span><span style="display:flex;"><span>            - <span style="color:#f92672">Table</span>: <span style="color:#ae81ff">users</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">Label</span>: <span style="color:#ae81ff">users</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">GidField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>            - <span style="color:#f92672">Table</span>: <span style="color:#ae81ff">products</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">Label</span>: <span style="color:#ae81ff">products</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">GidField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>            - <span style="color:#f92672">Table</span>: <span style="color:#ae81ff">purchases</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">Label</span>: <span style="color:#ae81ff">purchases</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">GidField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>          <span style="color:#f92672">Edges</span>:
+</span></span><span style="display:flex;"><span>            - <span style="color:#f92672">Table</span>: <span style="color:#ae81ff">purchase_items</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">Label</span>: <span style="color:#ae81ff">purchasedProducts</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">GidField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">From</span>:
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">SourceField</span>: <span style="color:#ae81ff">purchase_id</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestTable</span>: <span style="color:#ae81ff">purchases</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">To</span>:
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">SourceField</span>: <span style="color:#ae81ff">product_id</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestTable</span>: <span style="color:#ae81ff">products</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>            - <span style="color:#f92672">Table</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">Label</span>: <span style="color:#ae81ff">userPurchases          </span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">GidField</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">From</span>:
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">SourceField</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestTable</span>: <span style="color:#ae81ff">users</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestField</span>: <span style="color:#ae81ff">id</span>
+</span></span><span style="display:flex;"><span>              <span style="color:#f92672">To</span>:
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">SourceField</span>: <span style="color:#e6db74">&#34;&#34;</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestTable</span>: <span style="color:#ae81ff">purchases</span>
+</span></span><span style="display:flex;"><span>                <span style="color:#f92672">DestField</span>: <span style="color:#ae81ff">user_id</span>
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/developers/index.html b/docs/docs/developers/index.html
index 2bdc0cce..d22387a6 100644
--- a/docs/docs/developers/index.html
+++ b/docs/docs/developers/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/graphql/graph_schemas/index.html b/docs/docs/graphql/graph_schemas/index.html
index cc89c023..110b6365 100644
--- a/docs/docs/graphql/graph_schemas/index.html
+++ b/docs/docs/graphql/graph_schemas/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -357,7 +357,7 @@
   <div class="main col span_8_of_12">
     <h1 id="graph-schemas">Graph Schemas</h1>
 <p>Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires
-a graph schema as part of it's API. To utilize the GraphQL endpoint, there must be a
+a graph schema as part of it&rsquo;s API. To utilize the GraphQL endpoint, there must be a
 Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint.
 Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.
 The schemas are automatically added to the database following the naming pattern. <code>{graph-name}__schema__</code></p>
@@ -371,64 +371,64 @@ <h2 id="describing-graph-schemas">Describing Graph Schemas</h2>
 <li>POST the schema <code>/v1/graph/{graph-name}/schema</code> via curl or use the CLI. <code>grip schema post --yaml {file} --json {file}</code></li>
 <li>Configure GRIP to build the schema by sampling the data in each graph.</li>
 </ul>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Server:
-  <span style="color:#75715e"># Should the server periodically build the graph schemas?</span>
-  AutoBuildSchemas: <span style="color:#66d9ef">true</span>
-  <span style="color:#75715e"># How often the server should rebuild the graph schemas. Set to 0 to turn off</span>
-  SchemaRefreshInterval: <span style="color:#e6db74">&#34;24h&#34;</span>
-  <span style="color:#75715e"># How many vertices/edges to inspect to infer the schema</span>
-  SchemaInspectN: <span style="color:#ae81ff">500</span>
-  <span style="color:#75715e"># Strategy to use for selecting the vertices/edges to inspect.</span>
-  <span style="color:#75715e"># Random if True; first N otherwise</span>
-  SchemaRandomSample: <span style="color:#66d9ef">true</span>
-</code></pre></div><h2 id="example-schema">Example schema</h2>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">graph: example-graph
-
-edges:
-- data: {}
- from: Human
- gid: (Human)--starship-&gt;(Starship)
- label: starship
- to: Starship
-- data: {}
- from: Human
- gid: (Human)--friend-&gt;(Human)
- label: friend
- to: Human
-- data: {}
- from: Human
- gid: (Human)--friend-&gt;(Droid)
- label: friend
- to: Droid
-- data: {}
- from: Human
- gid: (Human)--appearsIn-&gt;(Movie)
- label: appearsIn
- to: Movie
-
-vertices:
-- data:
-   name: STRING
- gid: Movie
- label: Movie
-- data:
-   length: NUMERIC
-   name: STRING
- gid: Starship
- label: Starship
-- data:
-   name: STRING
-   primaryFunction: STRING
- gid: Droid
- label: Droid
-- data:
-   height: NUMERIC
-   homePlanet: STRING
-   mass: NUMERIC
-   name: STRING
- gid: Human
- label: Human
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Server</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#75715e"># Should the server periodically build the graph schemas?</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">AutoBuildSchemas</span>: <span style="color:#66d9ef">true</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#75715e"># How often the server should rebuild the graph schemas. Set to 0 to turn off</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">SchemaRefreshInterval</span>: <span style="color:#e6db74">&#34;24h&#34;</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#75715e"># How many vertices/edges to inspect to infer the schema</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">SchemaInspectN</span>: <span style="color:#ae81ff">500</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#75715e"># Strategy to use for selecting the vertices/edges to inspect.</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#75715e"># Random if True; first N otherwise</span>
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">SchemaRandomSample</span>: <span style="color:#66d9ef">true</span>
+</span></span></code></pre></div><h2 id="example-schema">Example schema</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">graph</span>: <span style="color:#ae81ff">example-graph</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">edges</span>:
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>: {}
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--starship-&gt;(Starship)</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">starship</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Starship</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>: {}
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--friend-&gt;(Human)</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">friend</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>: {}
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--friend-&gt;(Droid)</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">friend</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Droid</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>: {}
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--appearsIn-&gt;(Movie)</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">appearsIn</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Movie</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#f92672">vertices</span>:
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>:
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Movie</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Movie</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>:
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">length</span>: <span style="color:#ae81ff">NUMERIC</span>
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Starship</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Starship</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>:
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">primaryFunction</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Droid</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Droid</span>
+</span></span><span style="display:flex;"><span>- <span style="color:#f92672">data</span>:
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">height</span>: <span style="color:#ae81ff">NUMERIC</span>
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">homePlanet</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">mass</span>: <span style="color:#ae81ff">NUMERIC</span>
+</span></span><span style="display:flex;"><span>   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Human</span>
+</span></span><span style="display:flex;"><span> <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Human</span>
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/graphql/graphql/index.html b/docs/docs/graphql/graphql/index.html
index 6df84f9f..bbf9763e 100644
--- a/docs/docs/graphql/graphql/index.html
+++ b/docs/docs/graphql/graphql/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -361,24 +361,24 @@ <h1 id="graphql">GraphQL</h1>
 <p>GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.</p>
 <h3 id="load-built-in-example-graph">Load built-in example graph</h3>
 <p>Loading the example data and the example schema:</p>
-<pre><code>grip load example-graph
+<pre tabindex="0"><code>grip load example-graph
 </code></pre><p>See the example graph</p>
-<pre><code>grip dump example-graph --vertex --edge
+<pre tabindex="0"><code>grip dump example-graph --vertex --edge
 </code></pre><p>Sample components of the graph to produce a schema and store to a file</p>
-<pre><code>grip schema sample example-graph &gt; test.schema
+<pre tabindex="0"><code>grip schema sample example-graph &gt; test.schema
 </code></pre><p>You may want to edit the schema, but if it seems correct, post it to the server:</p>
-<pre><code>./grip schema post --json test.schema
+<pre tabindex="0"><code>./grip schema post --json test.schema
 </code></pre><p>See the graph schema</p>
-<pre><code>grip schema get example-graph
+<pre tabindex="0"><code>grip schema get example-graph
 </code></pre><h3 id="example-queries">Example queries</h3>
 <p>Get Types:</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d '{__schema{types{name}}}' http://localhost:8201/graphql/example-graph
+<pre tabindex="0"><code>curl -X POST -H &#34;Content-Type:application/graphql&#34; -d &#39;{__schema{types{name}}}&#39; http://localhost:8201/graphql/example-graph
 </code></pre><p>Get Info about Human object</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d '{__type(name:&quot;Human&quot;){fields{name}}}' http://localhost:8201/graphql/example-graph
+<pre tabindex="0"><code>curl -X POST -H &#34;Content-Type:application/graphql&#34; -d &#39;{__type(name:&#34;Human&#34;){fields{name}}}&#39; http://localhost:8201/graphql/example-graph
 </code></pre><p>Get List of all Human ids</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d 'query {Human{id}}' http://localhost:8201/graphql/example-graph
+<pre tabindex="0"><code>curl -X POST -H &#34;Content-Type:application/graphql&#34; -d &#39;query {Human{id}}&#39; http://localhost:8201/graphql/example-graph
 </code></pre><p>Get Human 1000 and list their friends</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d 'query {Human(id:&quot;1000&quot;){name,friend_to_Human{name}}}' http://localhost:8201/graphql/example-graph
+<pre tabindex="0"><code>curl -X POST -H &#34;Content-Type:application/graphql&#34; -d &#39;query {Human(id:&#34;1000&#34;){name,friend_to_Human{name}}}&#39; http://localhost:8201/graphql/example-graph
 </code></pre>
   </div>
 
diff --git a/docs/docs/graphql/index.html b/docs/docs/graphql/index.html
index 8994888f..a2d54c67 100644
--- a/docs/docs/graphql/index.html
+++ b/docs/docs/graphql/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/gripper/graphmodel/index.html b/docs/docs/gripper/graphmodel/index.html
index 7b89a4ea..be939a40 100644
--- a/docs/docs/gripper/graphmodel/index.html
+++ b/docs/docs/gripper/graphmodel/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -376,11 +376,11 @@ <h2 id="graph-model">Graph Model</h2>
 two other collections that have been mapped to vertices.</p>
 <h2 id="runtime-external-resource-config">Runtime External Resource Config</h2>
 <p>External resources are passed to GRIP as command line options. For the command line:</p>
-<pre><code>grip server config.yaml --er tableServer=localhost:50051 --er pfb=localhost:50052
+<pre tabindex="0"><code>grip server config.yaml --er tableServer=localhost:50051 --er pfb=localhost:50052
 </code></pre><p><code>tableServer</code> is a ER plugin that serves table data (see <code>gripper/test-graph</code>)
 while <code>pfb</code> parses PFB based files (see <a href="https://github.com/bmeg/grip_pfb">https://github.com/bmeg/grip_pfb</a> )</p>
 <p>The <code>config.yaml</code> is</p>
-<pre><code>Default: badger
+<pre tabindex="0"><code>Default: badger
 
 Drivers:
   badger:
@@ -390,51 +390,50 @@ <h2 id="runtime-external-resource-config">Runtime External Resource Config</h2>
     Gripper:
       ConfigFile: ./swapi.yaml
       Graph: swapi
-
 </code></pre><p>This runs with a default <code>badger</code> based driver, but also provides a GRIPPER based
 graph from the <code>swapi</code> mapping (see example graph map below).</p>
 <h2 id="example-graph-map">Example graph map</h2>
-<pre><code>vertices:
-  - gid: &quot;Character:&quot;
+<pre tabindex="0"><code>vertices:
+  - gid: &#34;Character:&#34;
     label: Character
     data:
       source: tableServer
       collection: Character
 
-  - gid: &quot;Planet:&quot;
+  - gid: &#34;Planet:&#34;
     label: Planet
     data:
       collection: Planet
       source: tableServer
 
-  - gid: &quot;Film:&quot;
+  - gid: &#34;Film:&#34;
     label: Film
     data:
       collection: Film
       source: tableServer
 
-  - gid: &quot;Species:&quot;
+  - gid: &#34;Species:&#34;
     label: Species
     data:
       source: tableServer
       collection: Species
 
-  - gid: &quot;Starship:&quot;
+  - gid: &#34;Starship:&#34;
     label: Starship
     data:
       source: tableServer
       collection: Starship
 
-  - gid: &quot;Vehicle:&quot;
+  - gid: &#34;Vehicle:&#34;
     label: Vehicle
     data:
       source: tableServer
       collection: Vehicle
 
 edges:
-  - gid: &quot;homeworld&quot;
-    from: &quot;Character:&quot;
-    to: &quot;Planet:&quot;
+  - gid: &#34;homeworld&#34;
+    from: &#34;Character:&#34;
+    to: &#34;Planet:&#34;
     label: homeworld
     data:
       fieldToField:
@@ -442,8 +441,8 @@ <h2 id="example-graph-map">Example graph map</h2>
         toField: $.id
 
   - gid: species
-    from: &quot;Character:&quot;
-    to: &quot;Species:&quot;
+    from: &#34;Character:&#34;
+    to: &#34;Species:&#34;
     label: species
     data:
       fieldToField:
@@ -451,8 +450,8 @@ <h2 id="example-graph-map">Example graph map</h2>
         toField: $.id
 
   - gid: people
-    from: &quot;Species:&quot;
-    to: &quot;Character:&quot;
+    from: &#34;Species:&#34;
+    to: &#34;Character:&#34;
     label: people
     data:
       edgeTable:
@@ -462,8 +461,8 @@ <h2 id="example-graph-map">Example graph map</h2>
         toField: $.to
 
   - gid: residents
-    from: &quot;Planet:&quot;
-    to: &quot;Character:&quot;
+    from: &#34;Planet:&#34;
+    to: &#34;Character:&#34;
     label: residents
     data:
       edgeTable:
@@ -473,136 +472,136 @@ <h2 id="example-graph-map">Example graph map</h2>
         toField: $.to
 
   - gid: filmVehicles
-    from: &quot;Film:&quot;
-    to: &quot;Vehicle:&quot;
-    label: &quot;vehicles&quot;
+    from: &#34;Film:&#34;
+    to: &#34;Vehicle:&#34;
+    label: &#34;vehicles&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmVehicles
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: vehicleFilms
-    to: &quot;Film:&quot;
-    from: &quot;Vehicle:&quot;
-    label: &quot;films&quot;
+    to: &#34;Film:&#34;
+    from: &#34;Vehicle:&#34;
+    label: &#34;films&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmVehicles
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 
   - gid: filmStarships
-    from: &quot;Film:&quot;
-    to: &quot;Starship:&quot;
-    label: &quot;starships&quot;
+    from: &#34;Film:&#34;
+    to: &#34;Starship:&#34;
+    label: &#34;starships&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmStarships
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: starshipFilms
-    to: &quot;Film:&quot;
-    from: &quot;Starship:&quot;
-    label: &quot;films&quot;
+    to: &#34;Film:&#34;
+    from: &#34;Starship:&#34;
+    label: &#34;films&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmStarships
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 
   - gid: filmPlanets
-    from: &quot;Film:&quot;
-    to: &quot;Planet:&quot;
-    label: &quot;planets&quot;
+    from: &#34;Film:&#34;
+    to: &#34;Planet:&#34;
+    label: &#34;planets&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmPlanets
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: planetFilms
-    to: &quot;Film:&quot;
-    from: &quot;Planet:&quot;
-    label: &quot;films&quot;
+    to: &#34;Film:&#34;
+    from: &#34;Planet:&#34;
+    label: &#34;films&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmPlanets
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 
   - gid: filmSpecies
-    from: &quot;Film:&quot;
-    to: &quot;Species:&quot;
-    label: &quot;species&quot;
+    from: &#34;Film:&#34;
+    to: &#34;Species:&#34;
+    label: &#34;species&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmSpecies
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: speciesFilms
-    to: &quot;Film:&quot;
-    from: &quot;Species:&quot;
-    label: &quot;films&quot;
+    to: &#34;Film:&#34;
+    from: &#34;Species:&#34;
+    label: &#34;films&#34;
     data:
       edgeTable:
         source: tableServer
         collection: filmSpecies
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 
   - gid: filmCharacters
-    from: &quot;Film:&quot;
-    to: &quot;Character:&quot;
+    from: &#34;Film:&#34;
+    to: &#34;Character:&#34;
     label: characters
     data:
       edgeTable:
         source: tableServer
         collection: filmCharacters
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: characterFilms
-    from: &quot;Character:&quot;
-    to: &quot;Film:&quot;
+    from: &#34;Character:&#34;
+    to: &#34;Film:&#34;
     label: films
     data:
       edgeTable:
         source: tableServer
         collection: filmCharacters
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 
   - gid: characterStarships
-    from: &quot;Character:&quot;
-    to: &quot;Starship:&quot;
-    label: &quot;starships&quot;
+    from: &#34;Character:&#34;
+    to: &#34;Starship:&#34;
+    label: &#34;starships&#34;
     data:
       edgeTable:
         source: tableServer
         collection: characterStarships
-        fromField: &quot;$.from&quot;
-        toField: &quot;$.to&quot;
+        fromField: &#34;$.from&#34;
+        toField: &#34;$.to&#34;
 
   - gid: starshipCharacters
-    to: &quot;Character:&quot;
-    from: &quot;Starship:&quot;
-    label: &quot;pilots&quot;
+    to: &#34;Character:&#34;
+    from: &#34;Starship:&#34;
+    label: &#34;pilots&#34;
     data:
       edgeTable:
         source: tableServer
         collection: characterStarships
-        toField: &quot;$.from&quot;
-        fromField: &quot;$.to&quot;
+        toField: &#34;$.from&#34;
+        fromField: &#34;$.to&#34;
 </code></pre>
   </div>
 
diff --git a/docs/docs/gripper/gripper/index.html b/docs/docs/gripper/gripper/index.html
index f16bf587..e16dbc42 100644
--- a/docs/docs/gripper/gripper/index.html
+++ b/docs/docs/gripper/gripper/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/gripper/index.html b/docs/docs/gripper/index.html
index 2b97232e..86d6262b 100644
--- a/docs/docs/gripper/index.html
+++ b/docs/docs/gripper/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/gripper/proxy/index.html b/docs/docs/gripper/proxy/index.html
index 8c208bcb..c8001b85 100644
--- a/docs/docs/gripper/proxy/index.html
+++ b/docs/docs/gripper/proxy/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -362,18 +362,18 @@ <h2 id="gripper-proxy">GRIPPER proxy</h2>
 is required to provide a GRPC interface that allows access to collections stored
 in the resource.</p>
 <p>The required functions include:</p>
-<pre><code>rpc GetCollections(Empty) returns (stream Collection);
+<pre tabindex="0"><code>rpc GetCollections(Empty) returns (stream Collection);
 </code></pre><p><code>GetCollections</code> returns a list of all of the Collections accessible via this server.</p>
-<pre><code>rpc GetCollectionInfo(Collection) returns (CollectionInfo);
+<pre tabindex="0"><code>rpc GetCollectionInfo(Collection) returns (CollectionInfo);
 </code></pre><p><code>GetCollectionInfo</code> provides information, such as the list of indexed fields, in a collection.</p>
-<pre><code>rpc GetIDs(Collection) returns (stream RowID);
+<pre tabindex="0"><code>rpc GetIDs(Collection) returns (stream RowID);
 </code></pre><p><code>GetIDs</code> returns a stream of all of the IDs found in a collection.</p>
-<pre><code>rpc GetRows(Collection) returns (stream Row);
+<pre tabindex="0"><code>rpc GetRows(Collection) returns (stream Row);
 </code></pre><p><code>GetRows</code> returns a stream of all of the rows in a collection.</p>
-<pre><code>rpc GetRowsByID(stream RowRequest) returns (stream Row);
+<pre tabindex="0"><code>rpc GetRowsByID(stream RowRequest) returns (stream Row);
 </code></pre><p><code>GetRowsByID</code> accepts a stream of row requests, each one requesting a single row
-by it's id, and then returns a stream of results.</p>
-<pre><code>rpc GetRowsByField(FieldRequest) returns (stream Row);
+by it&rsquo;s id, and then returns a stream of results.</p>
+<pre tabindex="0"><code>rpc GetRowsByField(FieldRequest) returns (stream Row);
 </code></pre><p><code>GetRowsByField</code> searches a collection, looking for values found in an indexed field.</p>
 
   </div>
diff --git a/docs/docs/index.html b/docs/docs/index.html
index 2cc7dd03..88a67332 100644
--- a/docs/docs/index.html
+++ b/docs/docs/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -357,7 +357,7 @@
   <div class="main col span_8_of_12">
     <h1 id="overview">Overview</h1>
 <p>GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including:
-MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.</p>
+MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.</p>
 <p>Properties of an GRIP graph:</p>
 <ul>
 <li>Both vertices and edges in a graph can have any number of properties associated with them.</li>
@@ -377,7 +377,7 @@ <h1 id="supported-systems">Supported Systems</h1>
 is based on <a href="https://github.com/dgraph-io/badger">Badger</a>.</li>
 <li><em>Database Backends</em> : GRIP can utilize a number of different database backends to store graph data.
 In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same
-as the Embedded deployment. Supported systems include Mongo, Portgres SQL and Elastic Search. When deployed
+as the Embedded deployment. Supported systems include Mongo, Portgres SQL. When deployed
 using Mongo, GRIP will translate GripQL queries into <a href="https://docs.mongodb.com/manual/core/aggregation-pipeline/">Mongo Aggregation Pipeline queries</a>.</li>
 <li><em>Plugin Existing Resources</em> : This mode is designed to take advantage of existing data resources, mapping
 them into a graph framework so they can be accessed using GripQL. This mode is currently read-only.</li>
diff --git a/docs/docs/index.xml b/docs/docs/index.xml
deleted file mode 100644
index 946b0fa3..00000000
--- a/docs/docs/index.xml
+++ /dev/null
@@ -1,371 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>Docs on GRIP</title>
-    <link>https://bmeg.github.io/grip/docs/</link>
-    <description>Recent content in Docs on GRIP</description>
-    <generator>Hugo -- gohugo.io</generator>
-    <language>en-us</language>
-    
-	<atom:link href="https://bmeg.github.io/grip/docs/index.xml" rel="self" type="application/rss+xml" />
-    
-    
-    <item>
-      <title></title>
-      <link>https://bmeg.github.io/grip/docs/tutorials/pathway-commons/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/tutorials/pathway-commons/</guid>
-      <description>Get Pathway Commons release
-curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz Convert to Property Graph
-grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &amp;quot;http://pathwaycommons.org/pc2/#=pc:&amp;quot; -m &amp;quot;http://www.biopax.org/release/biopax-level3.owl#=biopax:&amp;quot; </description>
-    </item>
-    
-    <item>
-      <title>Amazon Purchase Network</title>
-      <link>https://bmeg.github.io/grip/docs/tutorials/amazon/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/tutorials/amazon/</guid>
-      <description>Explore Amazon Product Co-Purchasing Network Metadata Download the data
-curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz Convert the data into vertices and edges
-python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data Create a graph called &amp;lsquo;amazon&amp;rsquo;
-grip create amazon Load the vertices/edges into the graph
-grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex Query the graph
-command line client
-grip query amazon &#39;O.query().V().out()&#39; python client
-pip install &amp;quot;git+https://github.com/bmeg/grip.git#egg=gripql&amp;amp;subdirectory=gripql/python/&amp;quot; import gripql conn = gripql.Connection(&amp;#34;http://localhost:8201&amp;#34;) g = conn.graph(&amp;#34;amazon&amp;#34;) # Count the Vertices print g.</description>
-    </item>
-    
-    <item>
-      <title>Basic Auth</title>
-      <link>https://bmeg.github.io/grip/docs/security/basic/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/security/basic/</guid>
-      <description>Basic Auth By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file:
-Server: BasicAuth: - User: testuser Password: abc123 Make sure to properly protect the configuration file so that it&#39;s not readable by everyone:
-$ chmod 600 grip.config.yml To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables:</description>
-    </item>
-    
-    <item>
-      <title>Database Configuration</title>
-      <link>https://bmeg.github.io/grip/docs/databases/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>Developers</title>
-      <link>https://bmeg.github.io/grip/docs/developers/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/developers/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>drop</title>
-      <link>https://bmeg.github.io/grip/docs/commands/drop/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/drop/</guid>
-      <description>grip drop &amp;lt;graph&amp;gt; Deletes a graph.</description>
-    </item>
-    
-    <item>
-      <title>Elasticsearch</title>
-      <link>https://bmeg.github.io/grip/docs/databases/elastic/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/elastic/</guid>
-      <description>Elasticsearch GRIP supports storing vertices and edges in Elasticsearch.
-Config:
-Default: elastic Drivers: elastic: Elasticsearch: URL: &amp;#34;http://localhost:9200&amp;#34; DBName: &amp;#34;gripdb&amp;#34; Username: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; </description>
-    </item>
-    
-    <item>
-      <title>Embedded KV Store</title>
-      <link>https://bmeg.github.io/grip/docs/databases/kvstore/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/kvstore/</guid>
-      <description>Embedded Key Value Stores GRIP supports storing vertices and edges in a variety of key-value stores including:
- Badger BoltDB LevelDB  Config:
-Default: kv Driver: kv: Badger: grip.db </description>
-    </item>
-    
-    <item>
-      <title>er</title>
-      <link>https://bmeg.github.io/grip/docs/commands/er/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/er/</guid>
-      <description>grip er The External Resource system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The grip er sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph.
-List collections provided by external resource
-grip er list Get info about a collection</description>
-    </item>
-    
-    <item>
-      <title>External Resource Proxies</title>
-      <link>https://bmeg.github.io/grip/docs/gripper/proxy/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/gripper/proxy/</guid>
-      <description>GRIPPER GRIPPER proxy With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource.
-The required functions include:
-rpc GetCollections(Empty) returns (stream Collection); GetCollections returns a list of all of the Collections accessible via this server.
-rpc GetCollectionInfo(Collection) returns (CollectionInfo); GetCollectionInfo provides information, such as the list of indexed fields, in a collection.</description>
-    </item>
-    
-    <item>
-      <title>Getting Started</title>
-      <link>https://bmeg.github.io/grip/docs/queries/getting_started/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/queries/getting_started/</guid>
-      <description>Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations.
-Install the Python Client Available on PyPI.
-pip install gripql Or install the latest development version:
-pip install &amp;quot;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&amp;quot; Using the Python Client Let&#39;s go through the features currently supported in the python client.
-First, import the client and create a connection to an GRIP server:
-import gripql G = gripql.</description>
-    </item>
-    
-    <item>
-      <title>Graph Model</title>
-      <link>https://bmeg.github.io/grip/docs/gripper/graphmodel/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/gripper/graphmodel/</guid>
-      <description>GRIPPER GRIP Plugable External Resources
-Graph Model The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex type will be mapped, and the edges describe how edges will be created. The gid of each vertex represents the prefix domain of all vertices that can be found in that source.
-The sources referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource.</description>
-    </item>
-    
-    <item>
-      <title>Graph Schemas</title>
-      <link>https://bmeg.github.io/grip/docs/graphql/graph_schemas/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/graphql/graph_schemas/</guid>
-      <description>Graph Schemas Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it&#39;s API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.</description>
-    </item>
-    
-    <item>
-      <title>GraphQL</title>
-      <link>https://bmeg.github.io/grip/docs/graphql/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/graphql/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>GraphQL</title>
-      <link>https://bmeg.github.io/grip/docs/graphql/graphql/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/graphql/graphql/</guid>
-      <description>GraphQL GraphQL support is considered Alpha. The code is not stable and the API will likely change. GraphQL access is only supported when using the MongoDB driver
-GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.
-Load built-in example graph Loading the example data and the example schema:
-grip load example-graph See the example graph
-grip dump example-graph --vertex --edge Sample components of the graph to produce a schema and store to a file</description>
-    </item>
-    
-    <item>
-      <title>GRIP Commands</title>
-      <link>https://bmeg.github.io/grip/docs/commands/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>GRIP Plugable External Resources</title>
-      <link>https://bmeg.github.io/grip/docs/gripper/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/gripper/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>GRIPPER</title>
-      <link>https://bmeg.github.io/grip/docs/databases/gripper/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/gripper/</guid>
-      <description>GRIPPER GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs.
-Example:
-Drivers: swapi-driver: Gripper: ConfigFile: ./swapi.yaml Graph: swapi ConfigFile - Path to GRIPPER graph map
-Graph - Name of the graph for the mapped external resources.</description>
-    </item>
-    
-    <item>
-      <title>Intro</title>
-      <link>https://bmeg.github.io/grip/docs/gripper/gripper/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/gripper/gripper/</guid>
-      <description>GRIPPER GRIP Plugin External Resources GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external resources and allow GRIP to access them are part of a unified graph. To integrate new resources into the graph, you first deploy griper proxies that plug into the external resources. They are unique and configured to access specific resources. These provide a view into external resources as a series of document collections. For example, an SQL gripper would plug into an SQL server and provide the tables as a set of collections with each every row a document.</description>
-    </item>
-    
-    <item>
-      <title>Jobs API</title>
-      <link>https://bmeg.github.io/grip/docs/queries/jobs_api/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/queries/jobs_api/</guid>
-      <description>Jobs API Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time.
-Submitting a job job = G.query().V().hasLabel(&amp;quot;Planet&amp;quot;).out().submit() Getting job status jinfo = G.getJob(job[&amp;quot;id&amp;quot;]) Example job info:
-{ &amp;#34;id&amp;#34;: &amp;#34;job-326392951&amp;#34;, &amp;#34;graph&amp;#34;: &amp;#34;test_graph_qd7rs7&amp;#34;, &amp;#34;state&amp;#34;: &amp;#34;COMPLETE&amp;#34;, &amp;#34;count&amp;#34;: &amp;#34;12&amp;#34;, &amp;#34;query&amp;#34;: [{&amp;#34;v&amp;#34;: []}, {&amp;#34;hasLabel&amp;#34;: [&amp;#34;Planet&amp;#34;]}, {&amp;#34;as&amp;#34;: &amp;#34;a&amp;#34;}, {&amp;#34;out&amp;#34;: []}], &amp;#34;timestamp&amp;#34;: &amp;#34;2021-03-30T23:12:01-07:00&amp;#34; } Reading job results for row in G.</description>
-    </item>
-    
-    <item>
-      <title>list</title>
-      <link>https://bmeg.github.io/grip/docs/commands/list/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/list/</guid>
-      <description>grip list graphs grip list graphs </description>
-    </item>
-    
-    <item>
-      <title>MongoDB</title>
-      <link>https://bmeg.github.io/grip/docs/databases/mongo/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/mongo/</guid>
-      <description>MongoDB GRIP supports storing vertices and edges in MongoDB.
-Config:
-Default: mongo Drivers: mongo: MongoDB: URL: &amp;#34;mongodb://localhost:27000&amp;#34; DBName: &amp;#34;gripdb&amp;#34; Username: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; UseCorePipeline: False BatchSize: 0 UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage.
-BatchSize - For core engine operations, GRIP dispatches element lookups in batches to minimize query overhead.</description>
-    </item>
-    
-    <item>
-      <title>mongoload</title>
-      <link>https://bmeg.github.io/grip/docs/commands/mongoload/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/mongoload/</guid>
-      <description>grip mongoload </description>
-    </item>
-    
-    <item>
-      <title>Operations</title>
-      <link>https://bmeg.github.io/grip/docs/queries/operations/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/queries/operations/</guid>
-      <description>Start a Traversal .V([ids]) Start query from Vertex
-G.query().V() Returns all vertices in graph
-G.query().V([&amp;#34;vertex1]&amp;#34;) Returns:
-{&amp;#34;gid&amp;#34; : &amp;#34;vertex1&amp;#34;, &amp;#34;label&amp;#34;:&amp;#34;TestVertex&amp;#34;, &amp;#34;data&amp;#34;:{}} .E([ids]) Start query from Edge
-G.query().E() Returns all edges in graph
-G.query().E([&amp;#34;edge1&amp;#34;]) Returns:
-{&amp;#34;gid&amp;#34; : &amp;#34;edge1&amp;#34;, &amp;#34;label&amp;#34;:&amp;#34;TestEdge&amp;#34;, From: &amp;#34;vertex1&amp;#34;, To: &amp;#34;vertex2&amp;#34;, data&amp;#34;:{}} Traverse the graph .in_(), inV() Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.</description>
-    </item>
-    
-    <item>
-      <title>PostgreSQL</title>
-      <link>https://bmeg.github.io/grip/docs/databases/psql/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/psql/</guid>
-      <description>PostgreSQL GRIP supports storing vertices and edges in PostgreSQL.
-Config:
-Default: psql Drivers: psql: PSQL: Host: localhost Port: 15432 User: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; DBName: &amp;#34;grip&amp;#34; SSLMode: disable </description>
-    </item>
-    
-    <item>
-      <title>query</title>
-      <link>https://bmeg.github.io/grip/docs/commands/query/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/query/</guid>
-      <description>grip query &amp;lt;graph&amp;gt; &amp;lt;query&amp;gt; Run a query on a graph.</description>
-    </item>
-    
-    <item>
-      <title>Query a Graph</title>
-      <link>https://bmeg.github.io/grip/docs/queries/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/queries/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>Referencing Fields</title>
-      <link>https://bmeg.github.io/grip/docs/queries/jsonpath/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/queries/jsonpath/</guid>
-      <description>Referencing Vertex/Edge Properties Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals.
-The following query:
-O.query().V([&amp;quot;ENSG00000012048&amp;quot;]).as_(&amp;quot;gene&amp;quot;).out(&amp;quot;variant&amp;quot;) Starts at vertex ENSG00000012048 and marks as gene:
-{ &amp;quot;gid&amp;quot;: &amp;quot;ENSG00000012048&amp;quot;, &amp;quot;label&amp;quot;: &amp;quot;gene&amp;quot;, &amp;quot;data&amp;quot;: { &amp;quot;symbol&amp;quot;: { &amp;quot;ensembl&amp;quot;: &amp;quot;ENSG00000012048&amp;quot;, &amp;quot;hgnc&amp;quot;: 1100, &amp;quot;entrez&amp;quot;: 672, &amp;quot;hugo&amp;quot;: &amp;quot;BRCA1&amp;quot; } &amp;quot;transcipts&amp;quot;: [&amp;quot;ENST00000471181.7&amp;quot;, &amp;quot;ENST00000357654.8&amp;quot;, &amp;quot;ENST00000493795.5&amp;quot;] } } as &amp;ldquo;gene&amp;rdquo; and traverses the graph to:</description>
-    </item>
-    
-    <item>
-      <title>Security</title>
-      <link>https://bmeg.github.io/grip/docs/security/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/security/</guid>
-      <description></description>
-    </item>
-    
-    <item>
-      <title>server</title>
-      <link>https://bmeg.github.io/grip/docs/commands/server/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/commands/server/</guid>
-      <description>grip server The server command starts up a graph server and waits for incoming requests.
-Default Configuration If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver.
-Networking By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201.</description>
-    </item>
-    
-    <item>
-      <title>SQL</title>
-      <link>https://bmeg.github.io/grip/docs/databases/sql/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/sql/</guid>
-      <description>Connect to an existing SQL database Note: This driver is being superseded by the GRIPPER engine
-GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB.
-Since GRIP uses Go&#39;s database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database.</description>
-    </item>
-    
-    <item>
-      <title>TCGA RNA Expression</title>
-      <link>https://bmeg.github.io/grip/docs/tutorials/tcga-rna/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/tutorials/tcga-rna/</guid>
-      <description>Explore TCGA RNA Expression Data Create the graph
-grip create tcga-rna Get the data
-curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz Load clinical data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &#39;Donor&#39; Load RNASeq data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &amp;quot;RNA:&amp;quot; --exclude RNA:Hugo_Symbol Connect RNASeq data to Clinical data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge &#39;RNA:{_gid}&#39; rna Connect Clinical data to subtypes
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &amp;quot;{EXPRESSION_SUBTYPE}&amp;quot; subtype --dst-vertex &amp;quot;{EXPRESSION_SUBTYPE}&amp;quot; Subtype Load Hugo Symbol to EntrezID translation table from RNA matrix annotations</description>
-    </item>
-    
-    <item>
-      <title>Tutorials</title>
-      <link>https://bmeg.github.io/grip/docs/tutorials/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/tutorials/</guid>
-      <description></description>
-    </item>
-    
-  </channel>
-</rss>
\ No newline at end of file
diff --git a/docs/docs/queries/getting_started/index.html b/docs/docs/queries/getting_started/index.html
index 3dc7ffd9..ee75303a 100644
--- a/docs/docs/queries/getting_started/index.html
+++ b/docs/docs/queries/getting_started/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -359,73 +359,73 @@ <h1 id="getting-started">Getting Started</h1>
 <p>GRIP has an API for making graph queries using structured data. Queries are defined using a series of step <a href="https://bmeg.github.io/grip/docs/queries/operations">operations</a>.</p>
 <h2 id="install-the-python-client">Install the Python Client</h2>
 <p>Available on <a href="https://pypi.org/project/gripql/">PyPI</a>.</p>
-<pre><code>pip install gripql
+<pre tabindex="0"><code>pip install gripql
 </code></pre><p>Or install the latest development version:</p>
-<pre><code>pip install &quot;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&quot;
+<pre tabindex="0"><code>pip install &#34;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&#34;
 </code></pre><h2 id="using-the-python-client">Using the Python Client</h2>
-<p>Let's go through the features currently supported in the python client.</p>
+<p>Let&rsquo;s go through the features currently supported in the python client.</p>
 <p>First, import the client and create a connection to an GRIP server:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> gripql
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div><p>Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span></code></pre></div><p>Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass
 authorization headers in its requests.</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> gripql
-
-<span style="color:#75715e"># Basic Auth Header - {&#39;Authorization&#39;: &#39;Basic dGVzdDpwYXNzd29yZA==&#39;}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>, user<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">test</span><span style="color:#e6db74">&#34;</span>, password<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">password</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-<span style="color:#75715e">#</span>
-
-<span style="color:#75715e"># Bearer Token - {&#39;Authorization&#39;: &#39;Bearer iamnotarealtoken&#39;}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>, token<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">iamnotarealtoken</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-
-<span style="color:#75715e"># OAuth2 / Custom - {&#34;OauthEmail&#34;: &#34;fake.user@gmail.com&#34;, &#34;OauthAccessToken&#34;: &#34;iamnotarealtoken&#34;, &#34;OauthExpires&#34;: 1551985931}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>,  credential_file<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">~/.grip_token.json</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div><p>Now that we have a connection to a graph instance, we can use this to make all of our queries.</p>
-<p>One of the first things you probably want to do is find some vertex out of all of the vertexes available in the system. In order to do this, we need to know something about the vertex we are looking for. To start, let's see if we can find a specific gene:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>))<span style="color:#f92672">.</span>execute()
-<span style="color:#66d9ef">print</span>(result)
-</code></pre></div><p>A couple things about this first and simplest query. We start with <code>O</code>, our grip client instance connected to the &ldquo;bmeg&rdquo; graph, and create a new query with <code>.query()</code>. This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results.</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Basic Auth Header - {&#39;Authorization&#39;: &#39;Basic dGVzdDpwYXNzd29yZA==&#39;}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>, user<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;test&#34;</span>, password<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;password&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span><span style="display:flex;"><span><span style="color:#75715e">#</span>
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Bearer Token - {&#39;Authorization&#39;: &#39;Bearer iamnotarealtoken&#39;}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>, token<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;iamnotarealtoken&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># OAuth2 / Custom - {&#34;OauthEmail&#34;: &#34;fake.user@gmail.com&#34;, &#34;OauthAccessToken&#34;: &#34;iamnotarealtoken&#34;, &#34;OauthExpires&#34;: 1551985931}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>,  credential_file<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;~/.grip_token.json&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span></code></pre></div><p>Now that we have a connection to a graph instance, we can use this to make all of our queries.</p>
+<p>One of the first things you probably want to do is find some vertex out of all of the vertexes available in the system. In order to do this, we need to know something about the vertex we are looking for. To start, let&rsquo;s see if we can find a specific gene:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#34;Gene&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;symbol&#34;</span>, <span style="color:#e6db74">&#34;TP53&#34;</span>))<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span>print(result)
+</span></span></code></pre></div><p>A couple things about this first and simplest query. We start with <code>O</code>, our grip client instance connected to the &ldquo;bmeg&rdquo; graph, and create a new query with <code>.query()</code>. This query is now being constructed. You can chain along as many operations as you want, and nothing will actually get sent to the server until you print the results.</p>
 <p>Once we make this query, we get a result:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">[
-  {<span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">gid</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">ENSG00000141510</span><span style="color:#e6db74">&#39;</span>,
-  <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">data</span><span style="color:#e6db74">&#39;</span>: {
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">end</span><span style="color:#e6db74">&#39;</span>: <span style="color:#ae81ff">7687550</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">description</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">tumor protein p53 [Source:HGNC Symbol</span><span style="color:#e6db74">%</span><span style="color:#e6db74">3BAcc:HGNC:11998]</span><span style="color:#e6db74">&#39;</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#39;</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">start</span><span style="color:#e6db74">&#39;</span>: <span style="color:#ae81ff">7661779</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">seqId</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">17</span><span style="color:#e6db74">&#39;</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">strand</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">-</span><span style="color:#e6db74">&#39;</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">id</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">ENSG00000141510</span><span style="color:#e6db74">&#39;</span>,
-    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">chromosome</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">17</span><span style="color:#e6db74">&#39;</span>
-  },
-  <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">label</span><span style="color:#e6db74">&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#39;</span>})
-]
-</code></pre></div><p>This represents the vertex we queried for above. All vertexes in the system will have a similar structure, basically:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>[
+</span></span><span style="display:flex;"><span>  {<span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;gid&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;ENSG00000141510&#39;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;data&#39;</span>: {
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;end&#39;</span>: <span style="color:#ae81ff">7687550</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;description&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;tumor protein p53 [Source:HGNC Symbol%3BAcc:HGNC:11998]&#39;</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;symbol&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;TP53&#39;</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;start&#39;</span>: <span style="color:#ae81ff">7661779</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;seqId&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;17&#39;</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;strand&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;-&#39;</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;id&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;ENSG00000141510&#39;</span>,
+</span></span><span style="display:flex;"><span>    <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;chromosome&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;17&#39;</span>
+</span></span><span style="display:flex;"><span>  },
+</span></span><span style="display:flex;"><span>  <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;label&#39;</span>: <span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;Gene&#39;</span>})
+</span></span><span style="display:flex;"><span>]
+</span></span></code></pre></div><p>This represents the vertex we queried for above. All vertexes in the system will have a similar structure, basically:</p>
 <ul>
 <li><em>gid</em>: This represents the global identifier for this vertex. In order to draw edges between different vertexes from different data sets we need an identifier that can be constructed from available data. Often, the <code>gid</code> will be the field that you query on as a starting point for a traversal.</li>
 <li><em>label</em>: The label represents the type of the vertex. All vertexes with a given label will share many property keys and edge labels, and form a logical group within the system.</li>
 <li><em>data</em>: This is where all the data goes. <code>data</code> can be an arbitrary map, and these properties can be referenced during traversals.</li>
 </ul>
 <p>The data on a query result can be accessed as properties on the result object; for example <code>result[0].data.symbol</code> would return:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#39;</span>
-</code></pre></div><p>You can also do a <code>has</code> query with a list of items using <code>gripql.within([...])</code> (other conditions exist, see the <code>Conditions</code> section below):</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">BRCA1</span><span style="color:#e6db74">&#34;</span>]))<span style="color:#f92672">.</span>render({<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">gid</span><span style="color:#e6db74">&#34;</span>: <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_gid</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>:<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>})<span style="color:#f92672">.</span>execute()
-<span style="color:#66d9ef">print</span>(result)
-</code></pre></div><p>This returns both Gene vertexes:</p>
-<pre><code>[
-  {u'symbol': u'TP53', u'gid': u'ENSG00000141510'},
-  {u'symbol': u'BRCA1', u'gid': u'ENSG00000012048'}
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#e6db74">u</span><span style="color:#e6db74">&#39;TP53&#39;</span>
+</span></span></code></pre></div><p>You can also do a <code>has</code> query with a list of items using <code>gripql.within([...])</code> (other conditions exist, see the <code>Conditions</code> section below):</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#34;Gene&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74">&#34;symbol&#34;</span>, [<span style="color:#e6db74">&#34;TP53&#34;</span>, <span style="color:#e6db74">&#34;BRCA1&#34;</span>]))<span style="color:#f92672">.</span>render({<span style="color:#e6db74">&#34;gid&#34;</span>: <span style="color:#e6db74">&#34;_gid&#34;</span>, <span style="color:#e6db74">&#34;symbol&#34;</span>:<span style="color:#e6db74">&#34;symbol&#34;</span>})<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span>print(result)
+</span></span></code></pre></div><p>This returns both Gene vertexes:</p>
+<pre tabindex="0"><code>[
+  {u&#39;symbol&#39;: u&#39;TP53&#39;, u&#39;gid&#39;: u&#39;ENSG00000141510&#39;},
+  {u&#39;symbol&#39;: u&#39;BRCA1&#39;, u&#39;gid&#39;: u&#39;ENSG00000012048&#39;}
 ]
-</code></pre><p>Once you are on a vertex, you can travel through that vertex's edges to find the vertexes it is connected to. Sometimes you don't even need to go all the way to the next vertex, the information on the edge between them may be sufficient.</p>
+</code></pre><p>Once you are on a vertex, you can travel through that vertex&rsquo;s edges to find the vertexes it is connected to. Sometimes you don&rsquo;t even need to go all the way to the next vertex, the information on the edge between them may be sufficient.</p>
 <p>Edges in the graph are directional, so there are both incoming and outgoing edges from each vertex, leading to other vertexes in the graph. Edges also have a <em>label</em>, which distinguishes the kind of connections different vertexes can have with one another.</p>
 <p>Starting with gene TP53, and see what kind of other vertexes it is connected to.</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>))<span style="color:#f92672">.</span>in_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TranscriptFor</span><span style="color:#e6db74">&#34;</span>)render({<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">gid</span><span style="color:#e6db74">&#34;</span>: <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_gid</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">label</span><span style="color:#e6db74">&#34;</span>:<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_label</span><span style="color:#e6db74">&#34;</span>})<span style="color:#f92672">.</span>execute()
-<span style="color:#66d9ef">print</span>(result)
-</code></pre></div><p>Here we have introduced a couple of new steps. The first is <code>.in_()</code>. This starts from wherever you are in the graph at the moment and travels out along all the incoming edges.
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>result <span style="color:#f92672">=</span> G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#34;Gene&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;symbol&#34;</span>, <span style="color:#e6db74">&#34;TP53&#34;</span>))<span style="color:#f92672">.</span>in_(<span style="color:#e6db74">&#34;TranscriptFor&#34;</span>)render({<span style="color:#e6db74">&#34;gid&#34;</span>: <span style="color:#e6db74">&#34;_gid&#34;</span>, <span style="color:#e6db74">&#34;label&#34;</span>:<span style="color:#e6db74">&#34;_label&#34;</span>})<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span>print(result)
+</span></span></code></pre></div><p>Here we have introduced a couple of new steps. The first is <code>.in_()</code>. This starts from wherever you are in the graph at the moment and travels out along all the incoming edges.
 Additionally, we have provided <code>TranscriptFor</code> as an argument to <code>.in_()</code>. This limits the returned vertices to only those connected to the <code>Gene</code>  verticies by edges labeled <code>TranscriptFor</code>.</p>
-<pre><code>[
-  {u'label': u'Transcript', u'gid': u'ENST00000413465'},
-  {u'label': u'Transcript', u'gid': u'ENST00000604348'},
+<pre tabindex="0"><code>[
+  {u&#39;label&#39;: u&#39;Transcript&#39;, u&#39;gid&#39;: u&#39;ENST00000413465&#39;},
+  {u&#39;label&#39;: u&#39;Transcript&#39;, u&#39;gid&#39;: u&#39;ENST00000604348&#39;},
   ...
 ]
 </code></pre><p>View a list of all available query operations <a href="https://bmeg.github.io/grip/docs/queries/operations">here</a>.</p>
diff --git a/docs/docs/queries/graph_schemas/index.html b/docs/docs/queries/graph_schemas/index.html
deleted file mode 100644
index 769af6f1..00000000
--- a/docs/docs/queries/graph_schemas/index.html
+++ /dev/null
@@ -1,330 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-<head>
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-  
-  <title>Graph Schemas &middot; GRIP</title>
-  
-
-  
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/poole.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/darcula.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/syntax.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/theme.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/funnel.css">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700">
-
-  
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://bmeg.github.io/grip/apple-touch-icon-144-precomposed.png">
-  <link rel="shortcut icon" href="https://bmeg.github.io/grip/favicon.png">
-
-  <script src="https://bmeg.github.io/grip/js/highlight.pack.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
-
-</head>
-<body>
-
-  <div class="global-header">
-    <div class="global-header-container">
-      <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
-      </div>
-      <ul class="global-header-nav">
-          <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
-          <li><a href="https://bmeg.github.io/grip/docs/">Docs</a></li>
-          <li><a href="https://github.com/bmeg/grip">GitHub</a></li>
-          <li><a href="https://gitter.im/bmeg/grip">Chat</a></li>
-        </ul>
-      <div class="global-header-ohsucb">
-        <a href="https://www.ohsu.edu/compbio/"><h2>OHSU Comp Bio</h2></a>
-      </div>
-    </div>
-  </div>
-
-
-<div class="content section group">
-
-  <div class="sidebar col span_3_of_12">
-    <ul class="sidebar-nav">
-      
-      
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/download/"
-             class="sidebar-nav-item "
-          >Download</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/docs/"
-             class="sidebar-nav-item "
-          >Overview</a></li>
-          
-        
-        <li>
-          
-          <span class="intermediate">Setup your Database</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/kvstore/"
-                   class="sidebar-nav-item "
-                >Embedded KV Store</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/mongo/"
-                   class="sidebar-nav-item "
-                >MongoDB</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/psql/"
-                   class="sidebar-nav-item "
-                >PostgreSQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/sql/"
-                   class="sidebar-nav-item "
-                >SQL</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Query a Graph</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/getting_started/"
-                   class="sidebar-nav-item "
-                >Getting Started</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/operations/"
-                   class="sidebar-nav-item "
-                >Operations</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/jsonpath/"
-                   class="sidebar-nav-item "
-                >Referencing Fields</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/graph_schemas/"
-                   class="sidebar-nav-item  active"
-                >Graph Schemas</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/graphql/"
-                   class="sidebar-nav-item "
-                >GraphQL</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Tutorials</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/amazon/"
-                   class="sidebar-nav-item "
-                >Amazon Purchase Network</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/tcga-rna/"
-                   class="sidebar-nav-item "
-                >TCGA RNA Expression</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Security</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/security/basic/"
-                   class="sidebar-nav-item "
-                >Basic Auth</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Developers</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://github.com/bmeg/grip/blob/master/gripql/gripql.proto"
-                   class="sidebar-nav-item "
-                >API</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://godoc.org/github.com/bmeg/grip"
-                   class="sidebar-nav-item "
-                >GoDoc</a></li>
-            </ul>
-          </li>
-          
-          
-        
-      
-    </ul>
-  </div>
-
-  <div class="main col span_8_of_12">
-    
-
-<h1 id="graph-schemas">Graph Schemas</h1>
-
-<p>Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.
-The schemas are automatically added to the database following the naming pattern <code>{graph-name}__schema__</code>.</p>
-
-<h2 id="get-the-schema-of-a-graph">Get the schema of a graph</h2>
-
-<p>The schema of a graph can be accessed via a GET request to <code>/v1/graph/{graph-name}/schema</code>.</p>
-
-<p>Alternatively, you can use the grip CLI: <code>grip schema get {graph-name}</code>.</p>
-
-<h2 id="describing-graph-schemas">Describing graph schemas</h2>
-
-<p>There are several methods for desribing the schema of a graph.</p>
-
-<ul>
-<li>Provide the schema (as a YAML file) to the server at runtime. <code>grip server --schema {schema-file}</code></li>
-<li>POST the schema <code>/v1/graph/{graph-name}/schema</code> via curl or use the CLI <code>grip schema post --yaml {file} --json {file}</code>.</li>
-<li>Configure Grip to build the schema by sampling the data in each graph.</li>
-</ul>
-
-<pre><code class="language-yaml">Server:
-  # Should the server periodically build the graph schemas?
-  AutoBuildSchemas: true
-  # How often the server should rebuild the graph schemas. Set to 0 to turn off
-  SchemaRefreshInterval: &quot;24h&quot;
-  # How many vertices/edges to inspect to infer the schema
-  SchemaInspectN: 500
-  # Strategy to use for selecting the vertices/edges to inspect.
-  # Random if True; first N otherwise
-  SchemaRandomSample: true
-</code></pre>
-
-<h2 id="example-schema">Example schema</h2>
-
-<pre><code class="language-yaml"> graph: example-graph
-
- edges:
-- data: {}
-  from: Human
-  gid: (Human)--starship-&gt;(Starship)
-  label: starship
-  to: Starship
-- data: {}
-  from: Human
-  gid: (Human)--friend-&gt;(Human)
-  label: friend
-  to: Human
-- data: {}
-  from: Human
-  gid: (Human)--friend-&gt;(Droid)
-  label: friend
-  to: Droid
-- data: {}
-  from: Human
-  gid: (Human)--appearsIn-&gt;(Movie)
-  label: appearsIn
-  to: Movie
-
-vertices:
-- data:
-    name: STRING
-  gid: Movie
-  label: Movie
-- data:
-    length: NUMERIC
-    name: STRING
-  gid: Starship
-  label: Starship
-- data:
-    name: STRING
-    primaryFunction: STRING
-  gid: Droid
-  label: Droid
-- data:
-    height: NUMERIC
-    homePlanet: STRING
-    mass: NUMERIC
-    name: STRING
-  gid: Human
-  label: Human
-</code></pre>
-
-  </div>
-
-</div>
-</body>
-</html>
diff --git a/docs/docs/queries/graphql/index.html b/docs/docs/queries/graphql/index.html
deleted file mode 100644
index ef14b88d..00000000
--- a/docs/docs/queries/graphql/index.html
+++ /dev/null
@@ -1,305 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-<head>
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-  
-  <title>GraphQL &middot; GRIP</title>
-  
-
-  
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/poole.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/darcula.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/syntax.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/theme.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/funnel.css">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700">
-
-  
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://bmeg.github.io/grip/apple-touch-icon-144-precomposed.png">
-  <link rel="shortcut icon" href="https://bmeg.github.io/grip/favicon.png">
-
-  <script src="https://bmeg.github.io/grip/js/highlight.pack.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
-
-</head>
-<body>
-
-  <div class="global-header">
-    <div class="global-header-container">
-      <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
-      </div>
-      <ul class="global-header-nav">
-          <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
-          <li><a href="https://bmeg.github.io/grip/docs/">Docs</a></li>
-          <li><a href="https://github.com/bmeg/grip">GitHub</a></li>
-          <li><a href="https://gitter.im/bmeg/grip">Chat</a></li>
-        </ul>
-      <div class="global-header-ohsucb">
-        <a href="https://www.ohsu.edu/compbio/"><h2>OHSU Comp Bio</h2></a>
-      </div>
-    </div>
-  </div>
-
-
-<div class="content section group">
-
-  <div class="sidebar col span_3_of_12">
-    <ul class="sidebar-nav">
-      
-      
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/docs/"
-             class="sidebar-nav-item "
-          >Overview</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/download/"
-             class="sidebar-nav-item "
-          >Download</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/graph_schemas/"
-             class="sidebar-nav-item "
-          >Graph Schemas</a></li>
-          
-        
-        <li>
-          
-          <span class="intermediate">Setup your Database</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/kvstore/"
-                   class="sidebar-nav-item "
-                >Embedded KV Store</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/mongo/"
-                   class="sidebar-nav-item "
-                >MongoDB</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/psql/"
-                   class="sidebar-nav-item "
-                >PostgreSQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/sql/"
-                   class="sidebar-nav-item "
-                >SQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/gripper/"
-                   class="sidebar-nav-item "
-                >GRIPPER</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Query a Graph</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/getting_started/"
-                   class="sidebar-nav-item "
-                >Getting Started</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/operations/"
-                   class="sidebar-nav-item "
-                >Operations</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/jsonpath/"
-                   class="sidebar-nav-item "
-                >Referencing Fields</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/graphql/"
-                   class="sidebar-nav-item  active"
-                >GraphQL</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Tutorials</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/amazon/"
-                   class="sidebar-nav-item "
-                >Amazon Purchase Network</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/tcga-rna/"
-                   class="sidebar-nav-item "
-                >TCGA RNA Expression</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Security</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/security/basic/"
-                   class="sidebar-nav-item "
-                >Basic Auth</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Developers</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://github.com/bmeg/grip/blob/master/gripql/gripql.proto"
-                   class="sidebar-nav-item "
-                >API</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://godoc.org/github.com/bmeg/grip"
-                   class="sidebar-nav-item "
-                >GoDoc</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">GIPPER</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/gripper/"
-                   class="sidebar-nav-item "
-                >Intro</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/proxy/"
-                   class="sidebar-nav-item "
-                >External Resource Proxies</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/graphmodel/"
-                   class="sidebar-nav-item "
-                >Graph Model</a></li>
-            </ul>
-          </li>
-          
-          
-        
-      
-    </ul>
-  </div>
-
-  <div class="main col span_8_of_12">
-    <h1 id="graphql">GraphQL</h1>
-<p>GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.</p>
-<p><strong><em>GraphQL access is only supported when using the MongoDB driver</em></strong></p>
-<h3 id="load-built-in-example-graph">Load built-in example graph</h3>
-<p>Loading the example data and the example schema:</p>
-<pre><code>grip load example-graph
-</code></pre><p>See the example graph</p>
-<pre><code>grip dump example-graph --vertex --edge
-</code></pre><p>See the example graph schema</p>
-<pre><code>grip schema example-graph
-</code></pre><h3 id="example-queries">Example queries</h3>
-<p>Get Types:</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d '{__schema{types{name}}}' http://localhost:8201/graphql/example-graph
-</code></pre><p>Get Info about Human object</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d '{__type(name:&quot;Human&quot;){fields{name}}}' http://localhost:8201/graphql/example-graph
-</code></pre><p>Get List of all Human ids</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d 'query {Human{id}}' http://localhost:8201/graphql/example-graph
-</code></pre><p>Get Human 1000 and list their friends</p>
-<pre><code>curl -X POST -H &quot;Content-Type:application/graphql&quot; -d 'query {Human(id:&quot;1000&quot;){name,friend_to_Human{name}}}' http://localhost:8201/graphql/example-graph
-</code></pre>
-  </div>
-
-</div>
-</body>
-</html>
diff --git a/docs/docs/queries/index.html b/docs/docs/queries/index.html
index 5b64d24a..a9e644f6 100644
--- a/docs/docs/queries/index.html
+++ b/docs/docs/queries/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/queries/iterations/index.html b/docs/docs/queries/iterations/index.html
index 540fa8ca..8b2c2521 100644
--- a/docs/docs/queries/iterations/index.html
+++ b/docs/docs/queries/iterations/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/queries/jobs_api/index.html b/docs/docs/queries/jobs_api/index.html
index 6d0d17f6..a533ef67 100644
--- a/docs/docs/queries/jobs_api/index.html
+++ b/docs/docs/queries/jobs_api/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -360,30 +360,30 @@ <h1 id="jobs-api">Jobs API</h1>
 repeatedly. The query Jobs API provides a mechanism to submit graph traversals
 that will be evaluated asynchronously and can be retrieved at a later time.</p>
 <h3 id="submitting-a-job">Submitting a job</h3>
-<pre><code>job = G.query().V().hasLabel(&quot;Planet&quot;).out().submit()
+<pre tabindex="0"><code>job = G.query().V().hasLabel(&#34;Planet&#34;).out().submit()
 </code></pre><h3 id="getting-job-status">Getting job status</h3>
-<pre><code>jinfo = G.getJob(job[&quot;id&quot;])
+<pre tabindex="0"><code>jinfo = G.getJob(job[&#34;id&#34;])
 </code></pre><p>Example job info:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-json" data-lang="json">{
-  <span style="color:#f92672">&#34;id&#34;</span>: <span style="color:#e6db74">&#34;job-326392951&#34;</span>,
-  <span style="color:#f92672">&#34;graph&#34;</span>: <span style="color:#e6db74">&#34;test_graph_qd7rs7&#34;</span>,
-  <span style="color:#f92672">&#34;state&#34;</span>: <span style="color:#e6db74">&#34;COMPLETE&#34;</span>,
-  <span style="color:#f92672">&#34;count&#34;</span>: <span style="color:#e6db74">&#34;12&#34;</span>,
-  <span style="color:#f92672">&#34;query&#34;</span>: [{<span style="color:#f92672">&#34;v&#34;</span>: []}, {<span style="color:#f92672">&#34;hasLabel&#34;</span>: [<span style="color:#e6db74">&#34;Planet&#34;</span>]}, {<span style="color:#f92672">&#34;as&#34;</span>: <span style="color:#e6db74">&#34;a&#34;</span>}, {<span style="color:#f92672">&#34;out&#34;</span>: []}],
-  <span style="color:#f92672">&#34;timestamp&#34;</span>: <span style="color:#e6db74">&#34;2021-03-30T23:12:01-07:00&#34;</span>
-}
-</code></pre></div><h3 id="reading-job-results">Reading job results</h3>
-<pre><code>for row in G.readJob(job[&quot;id&quot;]):
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;id&#34;</span>: <span style="color:#e6db74">&#34;job-326392951&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;graph&#34;</span>: <span style="color:#e6db74">&#34;test_graph_qd7rs7&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;state&#34;</span>: <span style="color:#e6db74">&#34;COMPLETE&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;count&#34;</span>: <span style="color:#e6db74">&#34;12&#34;</span>,
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;query&#34;</span>: [{<span style="color:#f92672">&#34;v&#34;</span>: []}, {<span style="color:#f92672">&#34;hasLabel&#34;</span>: [<span style="color:#e6db74">&#34;Planet&#34;</span>]}, {<span style="color:#f92672">&#34;as&#34;</span>: <span style="color:#e6db74">&#34;a&#34;</span>}, {<span style="color:#f92672">&#34;out&#34;</span>: []}],
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">&#34;timestamp&#34;</span>: <span style="color:#e6db74">&#34;2021-03-30T23:12:01-07:00&#34;</span>
+</span></span><span style="display:flex;"><span>}
+</span></span></code></pre></div><h3 id="reading-job-results">Reading job results</h3>
+<pre tabindex="0"><code>for row in G.readJob(job[&#34;id&#34;]):
    print(row)
 </code></pre><h3 id="search-for-jobs">Search for jobs</h3>
 <p>Find jobs that match the prefix of the current request (example should find job from G.query().V().hasLabel(&ldquo;Planet&rdquo;).out())</p>
-<pre><code>jobs = G.query().V().hasLabel(&quot;Planet&quot;).out().out().count().searchJobs()
+<pre tabindex="0"><code>jobs = G.query().V().hasLabel(&#34;Planet&#34;).out().out().count().searchJobs()
 </code></pre><p>If there are multiple jobs that match the prefix of the search, all of them will be returned. It will be a client side
 job to decide which of the jobs to use as a starting point. This can either be the job with the longest matching prefix, or
 the most recent job. Note, that if the underlying database has changed since the job was run, adding additional steps to the
 traversal may produce inaccurate results.</p>
 <p>Once <code>job</code> has been selected from the returned list you can use these existing results and continue the traversal.</p>
-<pre><code>for res in G.resume(job[&quot;id&quot;]).out().count():
+<pre tabindex="0"><code>for res in G.resume(job[&#34;id&#34;]).out().count():
     print(res)
 </code></pre>
   </div>
diff --git a/docs/docs/queries/jsonpath/index.html b/docs/docs/queries/jsonpath/index.html
index 444e0389..cf7ed628 100644
--- a/docs/docs/queries/jsonpath/index.html
+++ b/docs/docs/queries/jsonpath/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -359,93 +359,93 @@ <h1 id="referencing-vertexedge-properties">Referencing Vertex/Edge Properties</h
 <p>Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal.
 GRIP uses a variation on JSONPath syntax as described in <a href="http://goessner.net/articles/">http://goessner.net/articles/</a> to reference fields during traversals.</p>
 <p>The following query:</p>
-<pre><code>O.query().V([&quot;ENSG00000012048&quot;]).as_(&quot;gene&quot;).out(&quot;variant&quot;)
+<pre tabindex="0"><code>O.query().V([&#34;ENSG00000012048&#34;]).as_(&#34;gene&#34;).out(&#34;variant&#34;)
 </code></pre><p>Starts at vertex <code>ENSG00000012048</code> and marks as <code>gene</code>:</p>
-<pre><code>{
-  &quot;gid&quot;: &quot;ENSG00000012048&quot;,
-  &quot;label&quot;: &quot;gene&quot;,
-  &quot;data&quot;: {
-    &quot;symbol&quot;: {
-      &quot;ensembl&quot;: &quot;ENSG00000012048&quot;,
-      &quot;hgnc&quot;: 1100,
-      &quot;entrez&quot;: 672,
-      &quot;hugo&quot;: &quot;BRCA1&quot;
+<pre tabindex="0"><code>{
+  &#34;gid&#34;: &#34;ENSG00000012048&#34;,
+  &#34;label&#34;: &#34;gene&#34;,
+  &#34;data&#34;: {
+    &#34;symbol&#34;: {
+      &#34;ensembl&#34;: &#34;ENSG00000012048&#34;,
+      &#34;hgnc&#34;: 1100,
+      &#34;entrez&#34;: 672,
+      &#34;hugo&#34;: &#34;BRCA1&#34;
     }
-    &quot;transcipts&quot;: [&quot;ENST00000471181.7&quot;, &quot;ENST00000357654.8&quot;, &quot;ENST00000493795.5&quot;]
+    &#34;transcipts&#34;: [&#34;ENST00000471181.7&#34;, &#34;ENST00000357654.8&#34;, &#34;ENST00000493795.5&#34;]
   }
 }
 </code></pre><p>as &ldquo;gene&rdquo; and traverses the graph to:</p>
-<pre><code>{
-  &quot;gid&quot;: &quot;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&quot;,
-  &quot;label&quot;: &quot;variant&quot;,
-  &quot;data&quot;: {
-    &quot;type&quot;: &quot;deletion&quot;
-    &quot;publications&quot;: [
+<pre tabindex="0"><code>{
+  &#34;gid&#34;: &#34;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&#34;,
+  &#34;label&#34;: &#34;variant&#34;,
+  &#34;data&#34;: {
+    &#34;type&#34;: &#34;deletion&#34;
+    &#34;publications&#34;: [
       {
-        &quot;pmid&quot;: 29480828,
-        &quot;doi&quot;: &quot;10.1097/MD.0000000000009380&quot;
+        &#34;pmid&#34;: 29480828,
+        &#34;doi&#34;: &#34;10.1097/MD.0000000000009380&#34;
       },
       {
-        &quot;pmid&quot;: 23666017,
-        &quot;doi&quot;: &quot;10.1097/IGC.0b013e31829527bd&quot;
+        &#34;pmid&#34;: 23666017,
+        &#34;doi&#34;: &#34;10.1097/IGC.0b013e31829527bd&#34;
       }
     ]
   }
 }
 </code></pre><p>Below is a table of field and the values they would reference in subsequent traversal operations.</p>
 <table>
-<thead>
-<tr>
-<th align="left">jsonpath</th>
-<th align="left">result</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td align="left">_gid</td>
-<td align="left">&ldquo;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&rdquo;</td>
-</tr>
-<tr>
-<td align="left">_label</td>
-<td align="left">&ldquo;variant&rdquo;</td>
-</tr>
-<tr>
-<td align="left">_data.type</td>
-<td align="left">&ldquo;deletion&rdquo;</td>
-</tr>
-<tr>
-<td align="left">type</td>
-<td align="left">&ldquo;deletion&rdquo;</td>
-</tr>
-<tr>
-<td align="left">publications[0].pmid</td>
-<td align="left">29480828</td>
-</tr>
-<tr>
-<td align="left">publications[:].pmid</td>
-<td align="left">[29480828, 23666017]</td>
-</tr>
-<tr>
-<td align="left">publications.pmid</td>
-<td align="left">[29480828, 23666017]</td>
-</tr>
-<tr>
-<td align="left">$gene.symbol.hugo</td>
-<td align="left">&ldquo;BRCA1&rdquo;</td>
-</tr>
-<tr>
-<td align="left">$gene.transcripts[0]</td>
-<td align="left">&ldquo;ENST00000471181.7&rdquo;</td>
-</tr>
-</tbody>
+  <thead>
+      <tr>
+          <th style="text-align: left">jsonpath</th>
+          <th style="text-align: left">result</th>
+      </tr>
+  </thead>
+  <tbody>
+      <tr>
+          <td style="text-align: left">_gid</td>
+          <td style="text-align: left">&ldquo;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&rdquo;</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">_label</td>
+          <td style="text-align: left">&ldquo;variant&rdquo;</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">_data.type</td>
+          <td style="text-align: left">&ldquo;deletion&rdquo;</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">type</td>
+          <td style="text-align: left">&ldquo;deletion&rdquo;</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">publications[0].pmid</td>
+          <td style="text-align: left">29480828</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">publications[:].pmid</td>
+          <td style="text-align: left">[29480828, 23666017]</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">publications.pmid</td>
+          <td style="text-align: left">[29480828, 23666017]</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">$gene.symbol.hugo</td>
+          <td style="text-align: left">&ldquo;BRCA1&rdquo;</td>
+      </tr>
+      <tr>
+          <td style="text-align: left">$gene.transcripts[0]</td>
+          <td style="text-align: left">&ldquo;ENST00000471181.7&rdquo;</td>
+      </tr>
+  </tbody>
 </table>
 <h2 id="usage-example">Usage Example:</h2>
-<pre><code>O.query().V([&quot;ENSG00000012048&quot;]).as_(&quot;gene&quot;).out(&quot;variant&quot;).render({&quot;variant_id&quot;: &quot;_gid&quot;, &quot;variant_type&quot;: &quot;type&quot;, &quot;gene_id&quot;: &quot;$gene._gid&quot;})
+<pre tabindex="0"><code>O.query().V([&#34;ENSG00000012048&#34;]).as_(&#34;gene&#34;).out(&#34;variant&#34;).render({&#34;variant_id&#34;: &#34;_gid&#34;, &#34;variant_type&#34;: &#34;type&#34;, &#34;gene_id&#34;: &#34;$gene._gid&#34;})
 </code></pre><p>returns</p>
-<pre><code>{
-  &quot;variant_id&quot;: &quot;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&quot;,
-  &quot;variant_type&quot;: &quot;deletion&quot;,
-  &quot;gene_id&quot;: &quot;ENSG00000012048&quot;
+<pre tabindex="0"><code>{
+  &#34;variant_id&#34;: &#34;NM_007294.3:c.4963_4981delTGGCCTGACCCCAGAAG&#34;,
+  &#34;variant_type&#34;: &#34;deletion&#34;,
+  &#34;gene_id&#34;: &#34;ENSG00000012048&#34;
 }
 </code></pre>
   </div>
diff --git a/docs/docs/queries/operations/index.html b/docs/docs/queries/operations/index.html
index 500d7c54..d5f9831a 100644
--- a/docs/docs/queries/operations/index.html
+++ b/docs/docs/queries/operations/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -358,20 +358,20 @@
     <h1 id="start-a-traversal">Start a Traversal</h1>
 <h2 id="vids">.V([ids])</h2>
 <p>Start query from Vertex</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()
-</code></pre></div><p>Returns all vertices in graph</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">vertex1]</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div><p>Returns:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-json" data-lang="json">{<span style="color:#f92672">&#34;gid&#34;</span> : <span style="color:#e6db74">&#34;vertex1&#34;</span>, <span style="color:#f92672">&#34;label&#34;</span>:<span style="color:#e6db74">&#34;TestVertex&#34;</span>, <span style="color:#f92672">&#34;data&#34;</span>:{}}
-</code></pre></div><h2 id="eids">.E([ids])</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()
+</span></span></code></pre></div><p>Returns all vertices in graph</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V([<span style="color:#e6db74">&#34;vertex1&#34;</span>])
+</span></span></code></pre></div><p>Returns:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{<span style="color:#f92672">&#34;gid&#34;</span> : <span style="color:#e6db74">&#34;vertex1&#34;</span>, <span style="color:#f92672">&#34;label&#34;</span>:<span style="color:#e6db74">&#34;TestVertex&#34;</span>, <span style="color:#f92672">&#34;data&#34;</span>:{}}
+</span></span></code></pre></div><h2 id="eids">.E([ids])</h2>
 <p>Start query from Edge</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E()
-</code></pre></div><p>Returns all edges in graph</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">edge1</span><span style="color:#e6db74">&#34;</span>])
-</code></pre></div><p>Returns:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-json" data-lang="json">{<span style="color:#f92672">&#34;gid&#34;</span> : <span style="color:#e6db74">&#34;edge1&#34;</span>, <span style="color:#f92672">&#34;label&#34;</span>:<span style="color:#e6db74">&#34;TestEdge&#34;</span>, <span style="color:#960050;background-color:#1e0010">F</span><span style="color:#960050;background-color:#1e0010">r</span><span style="color:#960050;background-color:#1e0010">o</span><span style="color:#960050;background-color:#1e0010">m</span><span style="color:#960050;background-color:#1e0010">:</span> <span style="color:#f92672">&#34;vertex1&#34;</span>, <span style="color:#960050;background-color:#1e0010">T</span><span style="color:#960050;background-color:#1e0010">o</span><span style="color:#960050;background-color:#1e0010">:</span> <span style="color:#f92672">&#34;vertex2&#34;</span>, <span style="color:#960050;background-color:#1e0010">d</span><span style="color:#960050;background-color:#1e0010">a</span><span style="color:#960050;background-color:#1e0010">t</span><span style="color:#960050;background-color:#1e0010">a</span><span style="color:#960050;background-color:#1e0010">&#34;</span><span style="color:#960050;background-color:#1e0010">:</span><span style="color:#960050;background-color:#1e0010">{</span>}<span style="color:#960050;background-color:#1e0010">}</span>
-</code></pre></div><h1 id="traverse-the-graph">Traverse the graph</h1>
-<h2 id="in--inv">.in_(), inV()</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E()
+</span></span></code></pre></div><p>Returns all edges in graph</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E([<span style="color:#e6db74">&#34;edge1&#34;</span>])
+</span></span></code></pre></div><p>Returns:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-json" data-lang="json"><span style="display:flex;"><span>{<span style="color:#f92672">&#34;gid&#34;</span> : <span style="color:#e6db74">&#34;edge1&#34;</span>, <span style="color:#f92672">&#34;label&#34;</span>:<span style="color:#e6db74">&#34;TestEdge&#34;</span>, <span style="color:#f92672">&#34;from&#34;</span>: <span style="color:#e6db74">&#34;vertex1&#34;</span>, <span style="color:#f92672">&#34;to&#34;</span>: <span style="color:#e6db74">&#34;vertex2&#34;</span>, <span style="color:#f92672">&#34;data&#34;</span>:{}}
+</span></span></code></pre></div><h1 id="traverse-the-graph">Traverse the graph</h1>
+<h2 id="in_-inv">.in_(), inV()</h2>
 <p>Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.</p>
 <h2 id="out-outv">.out(), .outV()</h2>
 <p>Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges.</p>
@@ -386,101 +386,115 @@ <h2 id="bothe">.bothE()</h2>
 <h1 id="filtering">Filtering</h1>
 <h2 id="has">.has()</h2>
 <p>Filter elements using conditional statements</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_label</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#34;</span>))<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>))
-</code></pre></div><h2 id="conditions">Conditions</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;_label&#34;</span>, <span style="color:#e6db74">&#34;Gene&#34;</span>))<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;symbol&#34;</span>, <span style="color:#e6db74">&#34;TP53&#34;</span>))
+</span></span></code></pre></div><h2 id="conditions">Conditions</h2>
 <p>Conditions are arguments to <code>.has()</code> that define selection conditions</p>
 <h3 id="gripqleqvariable-value">gripql.eq(variable, value)</h3>
 <p>Returns rows where variable == value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>))
-</code></pre></div><h3 id="gripqlneqvariable-value">gripql.neq(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;symbol&#34;</span>, <span style="color:#e6db74">&#34;TP53&#34;</span>))
+</span></span></code></pre></div><h3 id="gripqlneqvariable-value">gripql.neq(variable, value)</h3>
 <p>Returns rows where variable != value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>neq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>))
-</code></pre></div><h3 id="gripqlgtvariable-value">gripql.gt(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>neq(<span style="color:#e6db74">&#34;symbol&#34;</span>, <span style="color:#e6db74">&#34;TP53&#34;</span>))
+</span></span></code></pre></div><h3 id="gripqlgtvariable-value">gripql.gt(variable, value)</h3>
 <p>Returns rows where variable &gt; value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>gt(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">45</span>))
-</code></pre></div><h3 id="gripqlltvariable-value">gripql.lt(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>gt(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">45</span>))
+</span></span></code></pre></div><h3 id="gripqlltvariable-value">gripql.lt(variable, value)</h3>
 <p>Returns rows where variable &lt; value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>lt(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">45</span>))
-</code></pre></div><h3 id="gripqlgtevariable-value">gripql.gte(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>lt(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">45</span>))
+</span></span></code></pre></div><h3 id="gripqlgtevariable-value">gripql.gte(variable, value)</h3>
 <p>Returns rows where variable &gt;= value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>gte(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">45</span>))
-</code></pre></div><h3 id="gripqlltevariable-value">gripql.lte(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>gte(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">45</span>))
+</span></span></code></pre></div><h3 id="gripqlltevariable-value">gripql.lte(variable, value)</h3>
 <p>Returns rows where variable &lt;= value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>lte(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">45</span>))
-</code></pre></div><h3 id="gripqlinsidevariable-lower-bound-upper-bound">gripql.inside(variable, [lower_bound, upper_bound])</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>lte(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">45</span>))
+</span></span></code></pre></div><h3 id="gripqlinsidevariable-lower_bound-upper_bound">gripql.inside(variable, [lower_bound, upper_bound])</h3>
 <p>Returns rows where variable &gt; lower_bound &amp;&amp; variable &lt; upper_bound</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>inside(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
-</code></pre></div><h3 id="gripqloutsidevariable-lower-bound-upper-bound">gripql.outside(variable, [lower_bound, upper_bound])</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>inside(<span style="color:#e6db74">&#34;age&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
+</span></span></code></pre></div><h3 id="gripqloutsidevariable-lower_bound-upper_bound">gripql.outside(variable, [lower_bound, upper_bound])</h3>
 <p>Returns rows where variable &lt; lower_bound || variable &gt; upper_bound</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>outside(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
-</code></pre></div><h3 id="gripqlbetweenvariable-lower-bound-upper-bound">gripql.between(variable, [lower_bound, upper_bound])</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>outside(<span style="color:#e6db74">&#34;age&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
+</span></span></code></pre></div><h3 id="gripqlbetweenvariable-lower_bound-upper_bound">gripql.between(variable, [lower_bound, upper_bound])</h3>
 <p>Returns rows where variable &gt;= lower_bound &amp;&amp; variable &lt; upper_bound</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>between(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
-</code></pre></div><h3 id="gripqlwithinvariable-value">gripql.within(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>between(<span style="color:#e6db74">&#34;age&#34;</span>, [<span style="color:#ae81ff">30</span>, <span style="color:#ae81ff">45</span>]))
+</span></span></code></pre></div><h3 id="gripqlwithinvariable-value">gripql.within(variable, value)</h3>
 <p>Returns rows where variable is within provided values</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">BRCA1</span><span style="color:#e6db74">&#34;</span>]))
-</code></pre></div><h3 id="gripqlwithoutvariable-value">gripql.without(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74">&#34;symbol&#34;</span>, [<span style="color:#e6db74">&#34;TP53&#34;</span>, <span style="color:#e6db74">&#34;BRCA1&#34;</span>]))
+</span></span></code></pre></div><h3 id="gripqlwithoutvariable-value">gripql.without(variable, value)</h3>
 <p>Returns rows where variable is not within provided values</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>, [<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">TP53</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">BRCA1</span><span style="color:#e6db74">&#34;</span>]))
-</code></pre></div><h3 id="gripqlcontainsvariable-value">gripql.contains(variable, value)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>within(<span style="color:#e6db74">&#34;symbol&#34;</span>, [<span style="color:#e6db74">&#34;TP53&#34;</span>, <span style="color:#e6db74">&#34;BRCA1&#34;</span>]))
+</span></span></code></pre></div><h3 id="gripqlcontainsvariable-value">gripql.contains(variable, value)</h3>
 <p>Returns rows where variable contains value</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>in_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">groups</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">group1</span><span style="color:#e6db74">&#34;</span>))
-</code></pre></div><p>Returns:</p>
-<pre><code>{&quot;data&quot; : {&quot;groups&quot; : [&quot;group1&quot;, &quot;group2&quot;]}}
-</code></pre><h3 id="gripqland-conditions">gripql.and_([conditions])</h3>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>and_( [gripql<span style="color:#f92672">.</span>lte(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">45</span>), gripql<span style="color:#f92672">.</span>gte(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">age</span><span style="color:#e6db74">&#34;</span>, <span style="color:#ae81ff">35</span>)] ))
-</code></pre></div><h3 id="gripqlor-conditions">gripql.or_([conditions])</h3>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>or_( [<span style="color:#f92672">.</span><span style="color:#f92672">.</span><span style="color:#f92672">.</span>] ))
-</code></pre></div><h3 id="gripqlnot-condition">gripql.not_(condition)</h3>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>not_( [<span style="color:#f92672">.</span><span style="color:#f92672">.</span><span style="color:#f92672">.</span>] ))
-</code></pre></div><h1 id="output">Output</h1>
-<h2 id="as-name">.as_(name)</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>in_(<span style="color:#e6db74">&#34;groups&#34;</span>, <span style="color:#e6db74">&#34;group1&#34;</span>))
+</span></span></code></pre></div><p>Returns:</p>
+<pre tabindex="0"><code>{&#34;data&#34; : {&#34;groups&#34; : [&#34;group1&#34;, &#34;group2&#34;]}}
+</code></pre><h3 id="gripqland_conditions">gripql.and_([conditions])</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>and_( [gripql<span style="color:#f92672">.</span>lte(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">45</span>), gripql<span style="color:#f92672">.</span>gte(<span style="color:#e6db74">&#34;age&#34;</span>, <span style="color:#ae81ff">35</span>)] ))
+</span></span></code></pre></div><h3 id="gripqlor_conditions">gripql.or_([conditions])</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>or_( [<span style="color:#f92672">...</span>] ))
+</span></span></code></pre></div><h3 id="gripqlnot_condition">gripql.not_(condition)</h3>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>not_( [<span style="color:#f92672">...</span>] ))
+</span></span></code></pre></div><h1 id="output">Output</h1>
+<h2 id="as_name">.as_(name)</h2>
 <p>Store current row for future reference</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>as_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">a</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>out()<span style="color:#f92672">.</span>as_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">b</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div><h2 id="selectnames">.select([names])</h2>
-<p>Output previously marked elements</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>mark(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">a</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>out()<span style="color:#f92672">.</span>mark(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">b</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>select([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">a</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">b</span><span style="color:#e6db74">&#34;</span>])
-</code></pre></div><h2 id="limitcount">.limit(count)</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;a&#34;</span>)<span style="color:#f92672">.</span>out()<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;b&#34;</span>)
+</span></span></code></pre></div><h2 id="selectnames">.select([names])</h2>
+<p>Move traveler to previously marked position</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>mark(<span style="color:#e6db74">&#34;a&#34;</span>)<span style="color:#f92672">.</span>out()<span style="color:#f92672">.</span>mark(<span style="color:#e6db74">&#34;b&#34;</span>)<span style="color:#f92672">.</span>select(<span style="color:#e6db74">&#34;a&#34;</span>)
+</span></span></code></pre></div><h2 id="limitcount">.limit(count)</h2>
 <p>Limit number of total output rows</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>)
-</code></pre></div><h2 id="skipcount">.skip(count)</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>)
+</span></span></code></pre></div><h2 id="skipcount">.skip(count)</h2>
 <p>Start return after offset</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>skip(<span style="color:#ae81ff">5</span>)<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>)
-</code></pre></div><h2 id="rangestart-stop">.range(start, stop)</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>skip(<span style="color:#ae81ff">5</span>)<span style="color:#f92672">.</span>limit(<span style="color:#ae81ff">5</span>)
+</span></span></code></pre></div><h2 id="rangestart-stop">.range(start, stop)</h2>
 <p>As results are iterated return objects starting with lower index As traversers propagate through the traversal, it is possible to only allow a certain number of them to pass through with range()-step (filter). When the low-end of the range is not met, objects are continued to be iterated. When within the low (inclusive) and high (exclusive) range, traversers are emitted. When above the high range, the traversal breaks out of iteration. Finally, the use of -1 on the high range will emit remaining traversers after the low range begins.</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>range(<span style="color:#ae81ff">5</span>, <span style="color:#ae81ff">15</span>)
-</code></pre></div><h2 id="fieldsfields">.fields([fields])</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>range(<span style="color:#ae81ff">5</span>, <span style="color:#ae81ff">15</span>)
+</span></span></code></pre></div><h2 id="fieldsfields">.fields([fields])</h2>
 <p>Select which vertex/edge fields to return or exlucde. Operation with no arguments exlcudes all properties.
 &ldquo;gid&rdquo;, &ldquo;label&rdquo;, &ldquo;from&rdquo; and &ldquo;to&rdquo; are included by default.</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">vertex1</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>fields(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">symbol</span><span style="color:#e6db74">&#34;</span>)     <span style="color:#75715e"># include only symbol property</span>
-O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">vertex1</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>fields(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">-symbol</span><span style="color:#e6db74">&#34;</span>)    <span style="color:#75715e"># exclude symbol property</span>
-O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">vertex1</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>fields()             <span style="color:#75715e"># exclude all properties</span>
-</code></pre></div><h2 id="rendertemplate">.render(template)</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;vertex1&#34;</span>)<span style="color:#f92672">.</span>fields(<span style="color:#e6db74">&#34;symbol&#34;</span>)     <span style="color:#75715e"># include only symbol property</span>
+</span></span><span style="display:flex;"><span>O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;vertex1&#34;</span>)<span style="color:#f92672">.</span>fields(<span style="color:#e6db74">&#34;-symbol&#34;</span>)    <span style="color:#75715e"># exclude symbol property</span>
+</span></span><span style="display:flex;"><span>O<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;vertex1&#34;</span>)<span style="color:#f92672">.</span>fields()             <span style="color:#75715e"># exclude all properties</span>
+</span></span></code></pre></div><h2 id="rendertemplate">.render(template)</h2>
 <p>Render current selection into arbitrary data structure</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python">G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">vertex1</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>render()
-</code></pre></div><h2 id="aggregateaggregations">.aggregate([aggregations])</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span>G<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;vertex1&#34;</span>)<span style="color:#f92672">.</span>render()
+</span></span></code></pre></div><h2 id="aggregateaggregations">.aggregate([aggregations])</h2>
 <p>Aggregate fields in the returned edges/vertices.</p>
 <h2 id="aggregation-types">Aggregation Types</h2>
 <h3 id="gripqltermname-field-size">.gripql.term(name, field, size)</h3>
 <p>Return top n terms and their counts for a field.</p>
-<pre><code>G.query().V().hasLabel(&quot;Person&quot;).aggregate(gripql.term(&quot;top-names&quot;, &quot;name&quot;, 10))
+<pre tabindex="0"><code>G.query().V().hasLabel(&#34;Person&#34;).aggregate(gripql.term(&#34;top-names&#34;, &#34;name&#34;, 10))
 </code></pre><p>Counts <code>name</code> occurences across <code>Person</code> vertices and returns the 10 most frequent <code>name</code> values.</p>
 <h3 id="gripqlhistogramname-field-interval">.gripql.histogram(name, field, interval)</h3>
 <p>Return binned counts for a field.</p>
-<pre><code>G.query().V().hasLabel(&quot;Person&quot;).aggregate(gripql.histogram(&quot;age-hist&quot;, &quot;age&quot;, 5))
+<pre tabindex="0"><code>G.query().V().hasLabel(&#34;Person&#34;).aggregate(gripql.histogram(&#34;age-hist&#34;, &#34;age&#34;, 5))
 </code></pre><p>Creates a histogram of <code>age</code> values with bins of width 5 across <code>Person</code> vertices.</p>
 <h3 id="gripqlpercentilename-field-percents">.gripql.percentile(name, field, percents=[])</h3>
 <p>Return percentiles for a field.</p>
-<pre><code>G.query().V().hasLabel(&quot;Person&quot;).aggregate(gripql.percentile(&quot;age-percentiles&quot;, &quot;age&quot;, [25,50,75]))
+<pre tabindex="0"><code>G.query().V().hasLabel(&#34;Person&#34;).aggregate(gripql.percentile(&#34;age-percentiles&#34;, &#34;age&#34;, [25,50,75]))
 </code></pre><p>Calculates the 25th, 50th, and 75th percentiles for <code>age</code> values across <code>Person</code> vertices.</p>
-<h3 id="gripqlgripqlfieldfields--data">.gripql.gripql.field(&ldquo;fields&rdquo;, &ldquo;$._data&rdquo;))</h3>
+<h3 id="gripqlgripqlfieldfields-_data">.gripql.gripql.field(&ldquo;fields&rdquo;, &ldquo;$._data&rdquo;))</h3>
 <p>Returns all of the fields found in the data structure. Use <code>$._data</code> to get a listing
 of all fields found at the root level of records.</p>
 <h3 id="gripqltypename-field">gripql.type(name, field)</h3>
 <p>Returns the data type of requested field. For the python client, if <code>field</code> is not provided, it is copied from <code>name</code>.
 Current returned types include <code>NUMERIC</code>, <code>STRING</code> and <code>UNKNOWN</code>. If a field is always null, or has multiple types, it will
 be returned as <code>UNKNOWN</code>.</p>
-<h2 id="count">.count()</h2>
+<h2 id="pivotgid-key-value">.pivot(gid, key, value)</h2>
+<p>Aggregate fields across multiple records into a single record using a pivot operations. A pivot is
+an operation where a two column matrix, with one columns for keys and another column for values, is
+transformed so that the keys are used to name the columns and the values are put in those columns.
+So the stream of vertices:</p>
+<pre tabindex="0"><code>{&#34;_gid&#34;:&#34;observation_a1&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Alice&#34;, &#34;key&#34;:&#34;age&#34;, &#34;value&#34;:36}
+{&#34;_gid&#34;:&#34;observation_a2&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Alice&#34;, &#34;key&#34;:&#34;sex&#34;, &#34;value&#34;:&#34;Female&#34;}
+{&#34;_gid&#34;:&#34;observation_a3&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Alice&#34;, &#34;key&#34;:&#34;blood_pressure&#34;, &#34;value&#34;:&#34;111/78&#34;}
+{&#34;_gid&#34;:&#34;observation_b1&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Bob&#34;, &#34;key&#34;:&#34;age&#34;, &#34;value&#34;:42}
+{&#34;_gid&#34;:&#34;observation_b2&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Bob&#34;, &#34;key&#34;:&#34;sex&#34;, &#34;value&#34;:&#34;Male&#34;}
+{&#34;_gid&#34;:&#34;observation_b3&#34;, &#34;_label&#34;:&#34;Observation&#34;, &#34;subject&#34;:&#34;Bob&#34;, &#34;key&#34;:&#34;blood_pressure&#34;, &#34;value&#34;:&#34;120/80&#34;}
+</code></pre><p>with <code>.pivot(&quot;subject&quot;, &quot;key&quot;, &quot;value&quot;)</code> will produce:</p>
+<pre tabindex="0"><code>{&#34;_id&#34;:&#34;Alice&#34;, &#34;age&#34;:36, &#34;sex&#34;:&#34;Female&#34;, &#34;blood_pressure&#34;:&#34;111/78&#34;}
+{&#34;_id&#34;:&#34;Bob&#34;, &#34;age&#34;:42, &#34;sex&#34;:&#34;Male&#34;, &#34;blood_pressure&#34;:&#34;120/80&#34;}
+</code></pre><h2 id="count">.count()</h2>
 <p>Return the total count of returned edges/vertices.</p>
 <h2 id="distinctfields">.distinct([fields])</h2>
 <p>Only return distinct elements. An array of one or more fields may be passed in to define what elements are used to identify uniqueness. If none are
diff --git a/docs/docs/security/basic/index.html b/docs/docs/security/basic/index.html
index daccde3c..456415cf 100644
--- a/docs/docs/security/basic/index.html
+++ b/docs/docs/security/basic/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -359,34 +359,34 @@ <h1 id="basic-auth">Basic Auth</h1>
 <p>By default, an GRIP server allows open access to its API endpoints, but it
 can be configured to require basic password authentication. To enable this,
 include users and passwords in your config file:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml">Server:
-  BasicAuth:
-    - User: testuser
-      Password: abc123
-</code></pre></div><p>Make sure to properly protect the configuration file so that it's not readable
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-yaml" data-lang="yaml"><span style="display:flex;"><span><span style="color:#f92672">Server</span>:
+</span></span><span style="display:flex;"><span>  <span style="color:#f92672">BasicAuth</span>:
+</span></span><span style="display:flex;"><span>    - <span style="color:#f92672">User</span>: <span style="color:#ae81ff">testuser</span>
+</span></span><span style="display:flex;"><span>      <span style="color:#f92672">Password</span>: <span style="color:#ae81ff">abc123</span>
+</span></span></code></pre></div><p>Make sure to properly protect the configuration file so that it&rsquo;s not readable
 by everyone:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">$ chmod <span style="color:#ae81ff">600</span> grip.config.yml
-</code></pre></div><p>To use the password, set the <code>GRIP_USER</code> and <code>GRIP_PASSWORD</code> environment variables:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-bash" data-lang="bash">$ export GRIP_USER<span style="color:#f92672">=</span>testuser
-$ export GRIP_PASSWORD<span style="color:#f92672">=</span>abc123
-$ grip list
-</code></pre></div><h2 id="using-the-python-client">Using the Python Client</h2>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>$ chmod <span style="color:#ae81ff">600</span> grip.config.yml
+</span></span></code></pre></div><p>To use the password, set the <code>GRIP_USER</code> and <code>GRIP_PASSWORD</code> environment variables:</p>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-bash" data-lang="bash"><span style="display:flex;"><span>$ export GRIP_USER<span style="color:#f92672">=</span>testuser
+</span></span><span style="display:flex;"><span>$ export GRIP_PASSWORD<span style="color:#f92672">=</span>abc123
+</span></span><span style="display:flex;"><span>$ grip list
+</span></span></code></pre></div><h2 id="using-the-python-client">Using the Python Client</h2>
 <p>Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass
 authorization headers in its requests:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> gripql
-
-<span style="color:#75715e"># Basic Auth Header - {&#39;Authorization&#39;: &#39;Basic dGVzdDpwYXNzd29yZA==&#39;}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>, user<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">test</span><span style="color:#e6db74">&#34;</span>, password<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">password</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div><p>Although GRIP only supports basic password authentication, some servers may be proctected via a nginx or apache
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Basic Auth Header - {&#39;Authorization&#39;: &#39;Basic dGVzdDpwYXNzd29yZA==&#39;}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>, user<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;test&#34;</span>, password<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;password&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span></code></pre></div><p>Although GRIP only supports basic password authentication, some servers may be proctected via a nginx or apache
 server. The python client can be configured to handle these cases as well:</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> gripql 
-
-<span style="color:#75715e"># Bearer Token - {&#39;Authorization&#39;: &#39;Bearer iamnotarealtoken&#39;}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>, token<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">iamnotarealtoken</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-
-<span style="color:#75715e"># OAuth2 / Custom - {&#34;OauthEmail&#34;: &#34;fake.user@gmail.com&#34;, &#34;OauthAccessToken&#34;: &#34;iamnotarealtoken&#34;, &#34;OauthExpires&#34;: 1551985931}</span>
-G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">https://bmeg.io</span><span style="color:#e6db74">&#34;</span>,  credential_file<span style="color:#f92672">=</span><span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">~/.grip_token.json</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">bmeg</span><span style="color:#e6db74">&#34;</span>)
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql 
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Bearer Token - {&#39;Authorization&#39;: &#39;Bearer iamnotarealtoken&#39;}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>, token<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;iamnotarealtoken&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># OAuth2 / Custom - {&#34;OauthEmail&#34;: &#34;fake.user@gmail.com&#34;, &#34;OauthAccessToken&#34;: &#34;iamnotarealtoken&#34;, &#34;OauthExpires&#34;: 1551985931}</span>
+</span></span><span style="display:flex;"><span>G <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;https://bmeg.io&#34;</span>,  credential_file<span style="color:#f92672">=</span><span style="color:#e6db74">&#34;~/.grip_token.json&#34;</span>)<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;bmeg&#34;</span>)
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/security/index.html b/docs/docs/security/index.html
index e1f9cc58..4694ad0b 100644
--- a/docs/docs/security/index.html
+++ b/docs/docs/security/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/tutorials/amazon/index.html b/docs/docs/tutorials/amazon/index.html
index 9ba984ea..0fc25351 100644
--- a/docs/docs/tutorials/amazon/index.html
+++ b/docs/docs/tutorials/amazon/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -357,36 +357,36 @@
   <div class="main col span_8_of_12">
     <h1 id="explore-amazon-product-co-purchasing-network-metadata">Explore Amazon Product Co-Purchasing Network Metadata</h1>
 <p>Download the data</p>
-<pre><code>curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz
+<pre tabindex="0"><code>curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz
 </code></pre><p>Convert the data into vertices and edges</p>
-<pre><code>python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data
+<pre tabindex="0"><code>python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data
 </code></pre><p>Create a graph called &lsquo;amazon&rsquo;</p>
-<pre><code>grip create amazon
+<pre tabindex="0"><code>grip create amazon
 </code></pre><p>Load the vertices/edges into the graph</p>
-<pre><code>grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex
+<pre tabindex="0"><code>grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex
 </code></pre><p>Query the graph</p>
 <p><em>command line client</em></p>
-<pre><code>grip query amazon 'O.query().V().out()'
+<pre tabindex="0"><code>grip query amazon &#39;O.query().V().out()&#39;
 </code></pre><p><em>python client</em></p>
-<pre><code>pip install &quot;git+https://github.com/bmeg/grip.git#egg=gripql&amp;subdirectory=gripql/python/&quot;
-</code></pre><div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> gripql
-
-conn <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">http://localhost:8201</span><span style="color:#e6db74">&#34;</span>)
-
-g <span style="color:#f92672">=</span> conn<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">amazon</span><span style="color:#e6db74">&#34;</span>)
-
-<span style="color:#75715e"># Count the Vertices</span>
-<span style="color:#66d9ef">print</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>count()<span style="color:#f92672">.</span>execute()
-<span style="color:#75715e"># Count the Edges</span>
-<span style="color:#66d9ef">print</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E()<span style="color:#f92672">.</span>count()<span style="color:#f92672">.</span>execute()
-
-<span style="color:#75715e"># Try simple travesral</span>
-<span style="color:#66d9ef">print</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">B00000I06U</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>outE()<span style="color:#f92672">.</span>execute()
-
-<span style="color:#75715e"># Find every Book that is similar to a DVD</span>
-<span style="color:#66d9ef">for</span> result <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">group</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Book</span><span style="color:#e6db74">&#34;</span>))<span style="color:#f92672">.</span>as_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">a</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>out(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">similar</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">group</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">DVD</span><span style="color:#e6db74">&#34;</span>))<span style="color:#f92672">.</span>as_(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">b</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>select([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">a</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">b</span><span style="color:#e6db74">&#34;</span>]):
-    <span style="color:#66d9ef">print</span> result
-</code></pre></div>
+<pre tabindex="0"><code>pip install &#34;git+https://github.com/bmeg/grip.git#egg=gripql&amp;subdirectory=gripql/python/&#34;
+</code></pre><div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>conn <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;http://localhost:8201&#34;</span>)
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>g <span style="color:#f92672">=</span> conn<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;amazon&#34;</span>)
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Count the Vertices</span>
+</span></span><span style="display:flex;"><span>print g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>count()<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Count the Edges</span>
+</span></span><span style="display:flex;"><span>print g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>E()<span style="color:#f92672">.</span>count()<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Try simple travesral</span>
+</span></span><span style="display:flex;"><span>print g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;B00000I06U&#34;</span>)<span style="color:#f92672">.</span>outE()<span style="color:#f92672">.</span>execute()
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span><span style="color:#75715e"># Find every Book that is similar to a DVD</span>
+</span></span><span style="display:flex;"><span><span style="color:#66d9ef">for</span> result <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;group&#34;</span>, <span style="color:#e6db74">&#34;Book&#34;</span>))<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;a&#34;</span>)<span style="color:#f92672">.</span>out(<span style="color:#e6db74">&#34;similar&#34;</span>)<span style="color:#f92672">.</span>has(gripql<span style="color:#f92672">.</span>eq(<span style="color:#e6db74">&#34;group&#34;</span>, <span style="color:#e6db74">&#34;DVD&#34;</span>))<span style="color:#f92672">.</span>as_(<span style="color:#e6db74">&#34;b&#34;</span>)<span style="color:#f92672">.</span>select([<span style="color:#e6db74">&#34;a&#34;</span>, <span style="color:#e6db74">&#34;b&#34;</span>]):
+</span></span><span style="display:flex;"><span>    print result
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/docs/tutorials/index.html b/docs/docs/tutorials/index.html
index ce65d18e..ffd09a84 100644
--- a/docs/docs/tutorials/index.html
+++ b/docs/docs/tutorials/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
diff --git a/docs/docs/tutorials/pathway-commons/index.html b/docs/docs/tutorials/pathway-commons/index.html
index fb4bb15e..c7698f87 100644
--- a/docs/docs/tutorials/pathway-commons/index.html
+++ b/docs/docs/tutorials/pathway-commons/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -356,9 +356,9 @@
 
   <div class="main col span_8_of_12">
     <p>Get Pathway Commons release</p>
-<pre><code>curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz
+<pre tabindex="0"><code>curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz
 </code></pre><p>Convert to Property Graph</p>
-<pre><code>grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &quot;http://pathwaycommons.org/pc2/#=pc:&quot; -m &quot;http://www.biopax.org/release/biopax-level3.owl#=biopax:&quot;
+<pre tabindex="0"><code>grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &#34;http://pathwaycommons.org/pc2/#=pc:&#34; -m &#34;http://www.biopax.org/release/biopax-level3.owl#=biopax:&#34;
 </code></pre>
   </div>
 
diff --git a/docs/docs/tutorials/tcga-rna/index.html b/docs/docs/tutorials/tcga-rna/index.html
index 836dd502..84999b5b 100644
--- a/docs/docs/tutorials/tcga-rna/index.html
+++ b/docs/docs/tutorials/tcga-rna/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -357,37 +357,37 @@
   <div class="main col span_8_of_12">
     <h3 id="explore-tcga-rna-expression-data">Explore TCGA RNA Expression Data</h3>
 <p>Create the graph</p>
-<pre><code>grip create tcga-rna
+<pre tabindex="0"><code>grip create tcga-rna
 </code></pre><p>Get the data</p>
-<pre><code>curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz
+<pre tabindex="0"><code>curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz
 tar xvzf gbm_tcga_pub2013.tar.gz
 </code></pre><p>Load clinical data</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label 'Donor'
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &#39;Donor&#39;
 </code></pre><p>Load RNASeq data</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --row-label RNASeq --row-prefix &quot;RNA:&quot; --exclude RNA:Hugo_Symbol
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --row-label RNASeq --row-prefix &#34;RNA:&#34; --exclude RNA:Hugo_Symbol
 </code></pre><p>Connect RNASeq data to Clinical data</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --no-vertex --edge 'RNA:{_gid}' rna
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --no-vertex --edge &#39;RNA:{_gid}&#39; rna
 </code></pre><p>Connect Clinical data to subtypes</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &quot;{EXPRESSION_SUBTYPE}&quot; subtype --dst-vertex &quot;{EXPRESSION_SUBTYPE}&quot; Subtype
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &#34;{EXPRESSION_SUBTYPE}&#34; subtype --dst-vertex &#34;{EXPRESSION_SUBTYPE}&#34; Subtype
 </code></pre><p>Load Hugo Symbol to EntrezID translation table from RNA matrix annotations</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt --column-include Entrez_Gene_Id --row-label Gene
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt --column-include Entrez_Gene_Id --row-label Gene
 </code></pre><p>Load Mutation Information</p>
-<pre><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_mutations_extended.txt --skiprows 1 --index-col -1  --regex Matched_Norm_Sample_Barcode '\-\d\d$' '' --edge '{Matched_Norm_Sample_Barcode}' variantIn --edge '{Hugo_Symbol}' effectsGene --column-exclude ma_func.impact ma_fi.score MA_FI.score MA_Func.Impact MA:link.MSA MA:FImpact MA:protein.change MA:link.var MA:FIS MA:link.PDB --row-label Variant
+<pre tabindex="0"><code>./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_mutations_extended.txt --skiprows 1 --index-col -1  --regex Matched_Norm_Sample_Barcode &#39;\-\d\d$&#39; &#39;&#39; --edge &#39;{Matched_Norm_Sample_Barcode}&#39; variantIn --edge &#39;{Hugo_Symbol}&#39; effectsGene --column-exclude ma_func.impact ma_fi.score MA_FI.score MA_Func.Impact MA:link.MSA MA:FImpact MA:protein.change MA:link.var MA:FIS MA:link.PDB --row-label Variant
 </code></pre><p>Load Proneural samples into a matrix</p>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-python" data-lang="python"><span style="color:#f92672">import</span> pandas
-<span style="color:#f92672">import</span> gripql
-
-conn <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">http://localhost:8201</span><span style="color:#e6db74">&#34;</span>)
-g <span style="color:#f92672">=</span> conn<span style="color:#f92672">.</span>graph(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">tcga-rna</span><span style="color:#e6db74">&#34;</span>)
-genes <span style="color:#f92672">=</span> {}
-<span style="color:#66d9ef">for</span> k, v <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Gene</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>render([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_gid</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Hugo_Symbol</span><span style="color:#e6db74">&#34;</span>]):
-    genes[k] <span style="color:#f92672">=</span> v
-data <span style="color:#f92672">=</span> {}
-<span style="color:#66d9ef">for</span> row <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">Proneural</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>in_()<span style="color:#f92672">.</span>out(<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">rna</span><span style="color:#e6db74">&#34;</span>)<span style="color:#f92672">.</span>render([<span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_gid</span><span style="color:#e6db74">&#34;</span>, <span style="color:#e6db74"></span><span style="color:#e6db74">&#34;</span><span style="color:#e6db74">_data</span><span style="color:#e6db74">&#34;</span>]):
-    data[row[<span style="color:#ae81ff">0</span>]] <span style="color:#f92672">=</span> row[<span style="color:#ae81ff">1</span>]
-samples <span style="color:#f92672">=</span> pandas<span style="color:#f92672">.</span>DataFrame(data)<span style="color:#f92672">.</span>rename(genes)<span style="color:#f92672">.</span>transpose()<span style="color:#f92672">.</span>fillna(<span style="color:#ae81ff">0.0</span>)
-</code></pre></div><h1 id="matrix-load-project">Matrix Load project</h1>
-<pre><code>usage: load_matrix.py [-h] [--sep SEP] [--server SERVER]
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-python" data-lang="python"><span style="display:flex;"><span><span style="color:#f92672">import</span> pandas
+</span></span><span style="display:flex;"><span><span style="color:#f92672">import</span> gripql
+</span></span><span style="display:flex;"><span>
+</span></span><span style="display:flex;"><span>conn <span style="color:#f92672">=</span> gripql<span style="color:#f92672">.</span>Connection(<span style="color:#e6db74">&#34;http://localhost:8201&#34;</span>)
+</span></span><span style="display:flex;"><span>g <span style="color:#f92672">=</span> conn<span style="color:#f92672">.</span>graph(<span style="color:#e6db74">&#34;tcga-rna&#34;</span>)
+</span></span><span style="display:flex;"><span>genes <span style="color:#f92672">=</span> {}
+</span></span><span style="display:flex;"><span><span style="color:#66d9ef">for</span> k, v <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V()<span style="color:#f92672">.</span>hasLabel(<span style="color:#e6db74">&#34;Gene&#34;</span>)<span style="color:#f92672">.</span>render([<span style="color:#e6db74">&#34;_gid&#34;</span>, <span style="color:#e6db74">&#34;Hugo_Symbol&#34;</span>]):
+</span></span><span style="display:flex;"><span>    genes[k] <span style="color:#f92672">=</span> v
+</span></span><span style="display:flex;"><span>data <span style="color:#f92672">=</span> {}
+</span></span><span style="display:flex;"><span><span style="color:#66d9ef">for</span> row <span style="color:#f92672">in</span> g<span style="color:#f92672">.</span>query()<span style="color:#f92672">.</span>V(<span style="color:#e6db74">&#34;Proneural&#34;</span>)<span style="color:#f92672">.</span>in_()<span style="color:#f92672">.</span>out(<span style="color:#e6db74">&#34;rna&#34;</span>)<span style="color:#f92672">.</span>render([<span style="color:#e6db74">&#34;_gid&#34;</span>, <span style="color:#e6db74">&#34;_data&#34;</span>]):
+</span></span><span style="display:flex;"><span>    data[row[<span style="color:#ae81ff">0</span>]] <span style="color:#f92672">=</span> row[<span style="color:#ae81ff">1</span>]
+</span></span><span style="display:flex;"><span>samples <span style="color:#f92672">=</span> pandas<span style="color:#f92672">.</span>DataFrame(data)<span style="color:#f92672">.</span>rename(genes)<span style="color:#f92672">.</span>transpose()<span style="color:#f92672">.</span>fillna(<span style="color:#ae81ff">0.0</span>)
+</span></span></code></pre></div><h1 id="matrix-load-project">Matrix Load project</h1>
+<pre tabindex="0"><code>usage: load_matrix.py [-h] [--sep SEP] [--server SERVER]
                       [--row-label ROW_LABEL] [--row-prefix ROW_PREFIX] [-t]
                       [--index-col INDEX_COL] [--connect]
                       [--col-label COL_LABEL] [--col-prefix COL_PREFIX]
@@ -414,16 +414,16 @@ <h3 id="explore-tcga-rna-expression-data">Explore TCGA RNA Expression Data</h3>
   --index-col INDEX_COL
                         Column number to use as index (and gid for vertex
                         load)
-  --connect             Switch to 'fully connected mode' and load matrix cell
+  --connect             Switch to &#39;fully connected mode&#39; and load matrix cell
                         values on edges between row and column names
   --col-label COL_LABEL
-                        Column vertex label in 'connect' mode
+                        Column vertex label in &#39;connect&#39; mode
   --col-prefix COL_PREFIX
-                        Prefix added to col vertex gid in 'connect' mode
+                        Prefix added to col vertex gid in &#39;connect&#39; mode
   --edge-label EDGE_LABEL
-                        Edge label for edges in 'connect' mode
+                        Edge label for edges in &#39;connect&#39; mode
   --edge-prop EDGE_PROP
-                        Property name for storing value when in 'connect' mode
+                        Property name for storing value when in &#39;connect&#39; mode
   --columns [COLUMNS [COLUMNS ...]]
                         Rename columns in TSV
   --column-include COLUMN_INCLUDE
@@ -438,7 +438,6 @@ <h3 id="explore-tcga-rna-expression-data">Explore TCGA RNA Expression Data</h3>
   -x EXCLUDE, --exclude EXCLUDE
                         Exclude row id
   -d                    Run in debug mode. Print actions and make no changes
-
 </code></pre>
   </div>
 
diff --git a/docs/download/index.html b/docs/download/index.html
index c76a6a4c..7e83fafa 100644
--- a/docs/download/index.html
+++ b/docs/download/index.html
@@ -32,7 +32,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -132,15 +132,6 @@
           
           <span class="intermediate">Database Configuration</span></li>
           
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -252,6 +243,15 @@
             </ul>
           </li>
           
+          <li>
+            <ul class="sidebar-nav sidebar-nav-nested">
+              <li>
+                <a href="https://bmeg.github.io/grip/docs/queries/iterations/"
+                   class="sidebar-nav-item "
+                >Iteration</a></li>
+            </ul>
+          </li>
+          
           <li>
             <ul class="sidebar-nav sidebar-nav-nested">
               <li>
@@ -356,24 +356,24 @@
 
   <div class="main col span_8_of_12">
     
-<h3>Download 0.7.0</h3>
+<h3>Download </h3>
 
 <ul>
-  <li><a href="https://github.com/bmeg/grip/releases/download/0.7.0/grip-linux-amd64-0.7.0.tar.gz">Linux</a></li>
-  <li><a href="https://github.com/bmeg/grip/releases/download/0.7.0/grip-darwin-amd64-0.7.0.tar.gz">MacOS</a></li>
+  <li><a href="https://github.com/bmeg/grip/releases/download//grip-linux-amd64-.tar.gz">Linux</a></li>
+  <li><a href="https://github.com/bmeg/grip/releases/download//grip-darwin-amd64-.tar.gz">MacOS</a></li>
   <li><small>Windows is not supported sorry!</small></li>
 </ul>
 
 <h3 id="release-history">Release History</h3>
 <p>See the <a href="https://github.com/bmeg/grip/releases">Releases</a> page for release history.</p>
 <h2 id="docker">Docker</h2>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-shell" data-lang="shell">docker pull bmeg/grip
-docker run bmeg/grip grip server
-</code></pre></div><!-- raw HTML omitted -->
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-shell" data-lang="shell">$ git clone https://github.com/bmeg/grip.git
-$ cd grip
-$ make
-</code></pre></div>
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-shell" data-lang="shell"><span style="display:flex;"><span>docker pull bmeg/grip
+</span></span><span style="display:flex;"><span>docker run bmeg/grip grip server
+</span></span></code></pre></div><!-- raw HTML omitted -->
+<div class="highlight"><pre tabindex="0" style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;"><code class="language-shell" data-lang="shell"><span style="display:flex;"><span>$ git clone https://github.com/bmeg/grip.git
+</span></span><span style="display:flex;"><span>$ cd grip
+</span></span><span style="display:flex;"><span>$ make
+</span></span></code></pre></div>
   </div>
 
 </div>
diff --git a/docs/graph_schemas/index.html b/docs/graph_schemas/index.html
deleted file mode 100644
index 31784dc9..00000000
--- a/docs/graph_schemas/index.html
+++ /dev/null
@@ -1,356 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
-<head>
-  <link href="http://gmpg.org/xfn/11" rel="profile">
-  <meta http-equiv="content-type" content="text/html; charset=utf-8">
-
-  
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
-
-  
-  <title>Graph Schemas &middot; GRIP</title>
-  
-
-  
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/poole.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/darcula.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/syntax.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/theme.css">
-  <link rel="stylesheet" href="https://bmeg.github.io/grip/css/funnel.css">
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700">
-
-  
-  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://bmeg.github.io/grip/apple-touch-icon-144-precomposed.png">
-  <link rel="shortcut icon" href="https://bmeg.github.io/grip/favicon.png">
-
-  <script src="https://bmeg.github.io/grip/js/highlight.pack.js"></script>
-  <script>hljs.initHighlightingOnLoad();</script>
-
-</head>
-<body>
-
-  <div class="global-header">
-    <div class="global-header-container">
-      <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
-      </div>
-      <ul class="global-header-nav">
-          <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
-          <li><a href="https://bmeg.github.io/grip/docs/">Docs</a></li>
-          <li><a href="https://github.com/bmeg/grip">GitHub</a></li>
-          <li><a href="https://gitter.im/bmeg/grip">Chat</a></li>
-        </ul>
-      <div class="global-header-ohsucb">
-        <a href="https://www.ohsu.edu/compbio/"><h2>OHSU Comp Bio</h2></a>
-      </div>
-    </div>
-  </div>
-
-
-<div class="content section group">
-
-  <div class="sidebar col span_3_of_12">
-    <ul class="sidebar-nav">
-      
-      
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/docs/"
-             class="sidebar-nav-item "
-          >Overview</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/download/"
-             class="sidebar-nav-item "
-          >Download</a></li>
-          
-        
-        <li>
-          
-          <a href="https://bmeg.github.io/grip/graph_schemas/"
-             class="sidebar-nav-item  active"
-          >Graph Schemas</a></li>
-          
-        
-        <li>
-          
-          <span class="intermediate">Setup your Database</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/elastic/"
-                   class="sidebar-nav-item "
-                >Elasticsearch</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/kvstore/"
-                   class="sidebar-nav-item "
-                >Embedded KV Store</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/mongo/"
-                   class="sidebar-nav-item "
-                >MongoDB</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/psql/"
-                   class="sidebar-nav-item "
-                >PostgreSQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/sql/"
-                   class="sidebar-nav-item "
-                >SQL</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/databases/gripper/"
-                   class="sidebar-nav-item "
-                >GRIPPER</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Query a Graph</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/getting_started/"
-                   class="sidebar-nav-item "
-                >Getting Started</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/operations/"
-                   class="sidebar-nav-item "
-                >Operations</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/jsonpath/"
-                   class="sidebar-nav-item "
-                >Referencing Fields</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/queries/graphql/"
-                   class="sidebar-nav-item "
-                >GraphQL</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Tutorials</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/amazon/"
-                   class="sidebar-nav-item "
-                >Amazon Purchase Network</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/tutorials/tcga-rna/"
-                   class="sidebar-nav-item "
-                >TCGA RNA Expression</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Security</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/security/basic/"
-                   class="sidebar-nav-item "
-                >Basic Auth</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">Developers</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://github.com/bmeg/grip/blob/master/gripql/gripql.proto"
-                   class="sidebar-nav-item "
-                >API</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://godoc.org/github.com/bmeg/grip"
-                   class="sidebar-nav-item "
-                >GoDoc</a></li>
-            </ul>
-          </li>
-          
-          
-        
-        <li>
-          
-          <span class="intermediate">GIPPER</span></li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/gripper/"
-                   class="sidebar-nav-item "
-                >Intro</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/proxy/"
-                   class="sidebar-nav-item "
-                >External Resource Proxies</a></li>
-            </ul>
-          </li>
-          
-          <li>
-            <ul class="sidebar-nav sidebar-nav-nested">
-              <li>
-                <a href="https://bmeg.github.io/grip/docs/gripper/graphmodel/"
-                   class="sidebar-nav-item "
-                >Graph Model</a></li>
-            </ul>
-          </li>
-          
-          
-        
-      
-    </ul>
-  </div>
-
-  <div class="main col span_8_of_12">
-    <h1 id="graph-schemas">Graph Schemas</h1>
-<p>Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.
-The schemas are automatically added to the database following the naming pattern <code>{graph-name}__schema__</code>.</p>
-<h2 id="get-the-schema-of-a-graph">Get the schema of a graph</h2>
-<p>The schema of a graph can be accessed via a GET request to <code>/v1/graph/{graph-name}/schema</code>.</p>
-<p>Alternatively, you can use the grip CLI: <code>grip schema get {graph-name}</code>.</p>
-<h2 id="describing-graph-schemas">Describing graph schemas</h2>
-<p>There are several methods for describing the schema of a graph.</p>
-<ul>
-<li>Provide the schema (as a YAML file) to the server at runtime. <code>grip server --schema {schema-file}</code></li>
-<li>POST the schema <code>/v1/graph/{graph-name}/schema</code> via curl or use the CLI <code>grip schema post --yaml {file} --json {file}</code>.</li>
-<li>Configure Grip to build the schema by sampling the data in each graph.</li>
-</ul>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml"><span style="color:#f92672">Server</span>:
-  <span style="color:#75715e"># Should the server periodically build the graph schemas?</span>
-  <span style="color:#f92672">AutoBuildSchemas</span>: <span style="color:#66d9ef">true</span>
-  <span style="color:#75715e"># How often the server should rebuild the graph schemas. Set to 0 to turn off</span>
-  <span style="color:#f92672">SchemaRefreshInterval</span>: <span style="color:#e6db74">&#34;24h&#34;</span>
-  <span style="color:#75715e"># How many vertices/edges to inspect to infer the schema</span>
-  <span style="color:#f92672">SchemaInspectN</span>: <span style="color:#ae81ff">500</span>
-  <span style="color:#75715e"># Strategy to use for selecting the vertices/edges to inspect.</span>
-  <span style="color:#75715e"># Random if True; first N otherwise</span>
-  <span style="color:#f92672">SchemaRandomSample</span>: <span style="color:#66d9ef">true</span>
-</code></pre></div><h2 id="example-schema">Example schema</h2>
-<div class="highlight"><pre style="color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4"><code class="language-yaml" data-lang="yaml"><span style="color:#f92672">graph</span>: <span style="color:#ae81ff">example-graph</span>
-
-<span style="color:#f92672">edges</span>:
-- <span style="color:#f92672">data</span>: {}
- <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--starship-&gt;(Starship)</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">starship</span>
- <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Starship</span>
-- <span style="color:#f92672">data</span>: {}
- <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--friend-&gt;(Human)</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">friend</span>
- <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Human</span>
-- <span style="color:#f92672">data</span>: {}
- <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--friend-&gt;(Droid)</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">friend</span>
- <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Droid</span>
-- <span style="color:#f92672">data</span>: {}
- <span style="color:#f92672">from</span>: <span style="color:#ae81ff">Human</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">(Human)--appearsIn-&gt;(Movie)</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">appearsIn</span>
- <span style="color:#f92672">to</span>: <span style="color:#ae81ff">Movie</span>
-
-<span style="color:#f92672">vertices</span>:
-- <span style="color:#f92672">data</span>:
-   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Movie</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Movie</span>
-- <span style="color:#f92672">data</span>:
-   <span style="color:#f92672">length</span>: <span style="color:#ae81ff">NUMERIC</span>
-   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Starship</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Starship</span>
-- <span style="color:#f92672">data</span>:
-   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
-   <span style="color:#f92672">primaryFunction</span>: <span style="color:#ae81ff">STRING</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Droid</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Droid</span>
-- <span style="color:#f92672">data</span>:
-   <span style="color:#f92672">height</span>: <span style="color:#ae81ff">NUMERIC</span>
-   <span style="color:#f92672">homePlanet</span>: <span style="color:#ae81ff">STRING</span>
-   <span style="color:#f92672">mass</span>: <span style="color:#ae81ff">NUMERIC</span>
-   <span style="color:#f92672">name</span>: <span style="color:#ae81ff">STRING</span>
- <span style="color:#f92672">gid</span>: <span style="color:#ae81ff">Human</span>
- <span style="color:#f92672">label</span>: <span style="color:#ae81ff">Human</span>
-</code></pre></div>
-  </div>
-
-</div>
-</body>
-</html>
diff --git a/docs/index.html b/docs/index.html
index fcf913fc..5b3859fa 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1,8 +1,7 @@
-
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
 <head>
-	<meta name="generator" content="Hugo 0.62.0" />
+	<meta name="generator" content="Hugo 0.139.0">
   <link href="http://gmpg.org/xfn/11" rel="profile">
   <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
@@ -34,7 +33,7 @@
   <div class="global-header">
     <div class="global-header-container">
       <div class="global-header-home">
-        <a href="https://bmeg.github.io/grip"><h1>GRIP</h1></a>
+        <a href="https://bmeg.github.io/grip/"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
           <li><a href="https://bmeg.github.io/grip/download//">Download</a></li>
@@ -49,149 +48,154 @@
   </div>
 
 
-<div class="homepage-lead"><div class="homepage-lead-container">
-  <p>GRaph Integration Platform (GRIP)</p>
-  <a href="https://bmeg.github.io/grip/download" class="download-button">Download</a>
-  <a href="https://bmeg.github.io/grip/docs" class="docs-button">Documentation</a>
-</div></div>
+<div class="homepage-lead">
+    <div class="homepage-lead-container">
+        <p>GRaph Integration Platform (GRIP)</p>
+        <a href="https://bmeg.github.io/grip/download" class="download-button"
+            >Download</a
+        >
+        <a href="https://bmeg.github.io/grip/docs" class="docs-button">Documentation</a>
+    </div>
+</div>
 
 <div class="homepage">
-
-  <div class="homepage-intro">
-
-    <div class="section group">
-
+    <div class="homepage-intro">
+        <div class="section group"></div>
     </div>
 
-  </div>
+    <div class="homepage-demo">
+        <div>
+            The GRaph Integration Platform (GRIP) is a graph query engine
+            designed to span across multiple database backends. It supports
+            Mongo, SQL and has a plug in architecture to allow new resource to
+            be added.
+        </div>
 
-  <div class="homepage-demo">
-    <div>
-      The GRaph Integration Platform (GRIP) is a graph query engine designed to 
-      span across multiple database backends. It supports Mongo, SQL, ElasticSearch
-      and has a plug in architecture to allow new resource to be added.
-    </div>
+        <h1 class="demo-header" id="intro">A quick introduction</h1>
 
-    <h1 class="demo-header" id="intro">A quick introduction</h1>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Start an GRIP server</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Start an GRIP server</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip server --config grip.yml</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip server --config grip.yml</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>List all graphs</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>List all graphs</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip list</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip list</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Create a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Create a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip create example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip create example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Drop a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Drop a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip drop example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip drop example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Load data into a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Load data into a  graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip load example --edge edges.txt --vertex vertices.txt</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip load example --edge edges.txt --vertex vertices.txt</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Query a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Query a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip query example 'V().hasLabel("users")'</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip query example 'V().hasLabel("users")'</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Get vertex/edge counts for a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Get vertex/edge counts for a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip info example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip info example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Get the schema for a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Get the schema for a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip schema get example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip schema get example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Dump vertices/edges from a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Dump vertices/edges from a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip dump example --vertex</code></pre>
+            </div>
         </div>
+    </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip dump example --vertex</code></pre>
+    <div class="homepage-more">
+        <div class="section group">
+            <div class="col span_4_of_12">
+                <h3>Drop in for a chat.</h3>
+                <p>
+                    Join the
+                    <a href="https://gitter.im/bmeg/grip">Gitter channel</a>.
+                </p>
+            </div>
+
+            <div class="col span_4_of_12">
+                <h3>Get the code.</h3>
+                <p>
+                    Head over to
+                    <a href="https://github.com/bmeg/grip">GitHub</a> and dig
+                    in.
+                </p>
+            </div>
+
+            <div class="col span_4_of_12">
+                <h3>Give feedback.</h3>
+                <p>
+                    <a href="https://github.com/bmeg/grip/issues"
+                        >Let us know</a
+                    >
+                    what you think.
+                </p>
+            </div>
         </div>
-      </div>
-
-  </div>
-
-  <div class="homepage-more">
-
-    <div class="section group">
-
-      <div class="col span_4_of_12">
-        <h3>Drop in for a chat.</h3>
-        <p>Join the <a href="https://gitter.im/bmeg/grip">Gitter channel</a>.</p>
-      </div>
-
-      <div class="col span_4_of_12">
-        <h3>Get the code.</h3>
-        <p>Head over to <a href="https://github.com/bmeg/grip">GitHub</a> and dig in.</p>
-      </div>
-
-      <div class="col span_4_of_12">
-        <h3>Give feedback.</h3>
-        <p>
-          <a href="https://github.com/bmeg/grip/issues">Let us know</a> what you think.</p>
-      </div>
-
     </div>
 
-  </div>
-
-  <div class="homepage-footer"></div>
-
+    <div class="homepage-footer"></div>
 </div>
 
 
diff --git a/docs/index.xml b/docs/index.xml
index 2a86c8e3..edfe11f6 100644
--- a/docs/index.xml
+++ b/docs/index.xml
@@ -4,389 +4,253 @@
     <title>GRIP</title>
     <link>https://bmeg.github.io/grip/</link>
     <description>Recent content on GRIP</description>
-    <generator>Hugo -- gohugo.io</generator>
+    <generator>Hugo</generator>
     <language>en-us</language>
-    
-	<atom:link href="https://bmeg.github.io/grip/index.xml" rel="self" type="application/rss+xml" />
-    
-    
+    <atom:link href="https://bmeg.github.io/grip/index.xml" rel="self" type="application/rss+xml" />
     <item>
       <title></title>
       <link>https://bmeg.github.io/grip/docs/tutorials/pathway-commons/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/tutorials/pathway-commons/</guid>
-      <description>Get Pathway Commons release
-curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz Convert to Property Graph
-grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &amp;quot;http://pathwaycommons.org/pc2/#=pc:&amp;quot; -m &amp;quot;http://www.biopax.org/release/biopax-level3.owl#=biopax:&amp;quot; </description>
+      <description>&lt;p&gt;Get Pathway Commons release&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;curl -O http://www.pathwaycommons.org/archives/PC2/v10/PathwayCommons10.All.BIOPAX.owl.gz&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Convert to Property Graph&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip rdf --dump --gzip pc PathwayCommons10.All.BIOPAX.owl.gz -m &amp;#34;http://pathwaycommons.org/pc2/#=pc:&amp;#34; -m &amp;#34;http://www.biopax.org/release/biopax-level3.owl#=biopax:&amp;#34;&#xA;&lt;/code&gt;&lt;/pre&gt;</description>
     </item>
-    
     <item>
       <title>Amazon Purchase Network</title>
       <link>https://bmeg.github.io/grip/docs/tutorials/amazon/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/tutorials/amazon/</guid>
-      <description>Explore Amazon Product Co-Purchasing Network Metadata Download the data
-curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz Convert the data into vertices and edges
-python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data Create a graph called &amp;lsquo;amazon&amp;rsquo;
-grip create amazon Load the vertices/edges into the graph
-grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex Query the graph
-command line client
-grip query amazon &#39;O.query().V().out()&#39; python client
-pip install &amp;quot;git+https://github.com/bmeg/grip.git#egg=gripql&amp;amp;subdirectory=gripql/python/&amp;quot; import gripql conn = gripql.Connection(&amp;#34;http://localhost:8201&amp;#34;) g = conn.graph(&amp;#34;amazon&amp;#34;) # Count the Vertices print g.</description>
+      <description>&lt;h1 id=&#34;explore-amazon-product-co-purchasing-network-metadata&#34;&gt;Explore Amazon Product Co-Purchasing Network Metadata&lt;/h1&gt;&#xA;&lt;p&gt;Download the data&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;curl -O http://snap.stanford.edu/data/bigdata/amazon/amazon-meta.txt.gz&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Convert the data into vertices and edges&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;python $GOPATH/src/github.com/bmeg/grip/example/amazon_convert.py amazon-meta.txt.gz amazon.data&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Create a graph called &amp;lsquo;amazon&amp;rsquo;&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip create amazon&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Load the vertices/edges into the graph&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip load amazon --edge amazon.data.edge --vertex amazon.data.vertex&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Query the graph&lt;/p&gt;&#xA;&lt;p&gt;&lt;em&gt;command line client&lt;/em&gt;&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip query amazon &amp;#39;O.query().V().out()&amp;#39;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;&lt;em&gt;python client&lt;/em&gt;&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;pip install &amp;#34;git+https://github.com/bmeg/grip.git#egg=gripql&amp;amp;subdirectory=gripql/python/&amp;#34;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;import&lt;/span&gt; gripql&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;conn &lt;span style=&#34;color:#f92672&#34;&gt;=&lt;/span&gt; gripql&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;Connection(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;http://localhost:8201&amp;#34;&lt;/span&gt;)&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;g &lt;span style=&#34;color:#f92672&#34;&gt;=&lt;/span&gt; conn&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;graph(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;amazon&amp;#34;&lt;/span&gt;)&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#75715e&#34;&gt;# Count the Vertices&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;print g&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;V()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;count()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;execute()&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#75715e&#34;&gt;# Count the Edges&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;print g&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;E()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;count()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;execute()&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#75715e&#34;&gt;# Try simple travesral&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;print g&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;V(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;B00000I06U&amp;#34;&lt;/span&gt;)&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;outE()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;execute()&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#75715e&#34;&gt;# Find every Book that is similar to a DVD&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#66d9ef&#34;&gt;for&lt;/span&gt; result &lt;span style=&#34;color:#f92672&#34;&gt;in&lt;/span&gt; g&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;V()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;has(gripql&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;eq(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;group&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;Book&amp;#34;&lt;/span&gt;))&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;as_(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;a&amp;#34;&lt;/span&gt;)&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;out(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;similar&amp;#34;&lt;/span&gt;)&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;has(gripql&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;eq(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;group&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;DVD&amp;#34;&lt;/span&gt;))&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;as_(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;b&amp;#34;&lt;/span&gt;)&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;select([&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;a&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;b&amp;#34;&lt;/span&gt;]):&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    print result&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;</description>
     </item>
-    
     <item>
       <title>Basic Auth</title>
       <link>https://bmeg.github.io/grip/docs/security/basic/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/security/basic/</guid>
-      <description>Basic Auth By default, an GRIP server allows open access to its API endpoints, but it can be configured to require basic password authentication. To enable this, include users and passwords in your config file:
-Server: BasicAuth: - User: testuser Password: abc123 Make sure to properly protect the configuration file so that it&#39;s not readable by everyone:
-$ chmod 600 grip.config.yml To use the password, set the GRIP_USER and GRIP_PASSWORD environment variables:</description>
+      <description>&lt;h1 id=&#34;basic-auth&#34;&gt;Basic Auth&lt;/h1&gt;&#xA;&lt;p&gt;By default, an GRIP server allows open access to its API endpoints, but it&#xA;can be configured to require basic password authentication. To enable this,&#xA;include users and passwords in your config file:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-yaml&#34; data-lang=&#34;yaml&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Server&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;BasicAuth&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    - &lt;span style=&#34;color:#f92672&#34;&gt;User&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;testuser&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Password&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;abc123&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Make sure to properly protect the configuration file so that it&amp;rsquo;s not readable&#xA;by everyone:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-bash&#34; data-lang=&#34;bash&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ chmod &lt;span style=&#34;color:#ae81ff&#34;&gt;600&lt;/span&gt; grip.config.yml&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;To use the password, set the &lt;code&gt;GRIP_USER&lt;/code&gt; and &lt;code&gt;GRIP_PASSWORD&lt;/code&gt; environment variables:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-bash&#34; data-lang=&#34;bash&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ export GRIP_USER&lt;span style=&#34;color:#f92672&#34;&gt;=&lt;/span&gt;testuser&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ export GRIP_PASSWORD&lt;span style=&#34;color:#f92672&#34;&gt;=&lt;/span&gt;abc123&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ grip list&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;using-the-python-client&#34;&gt;Using the Python Client&lt;/h2&gt;&#xA;&lt;p&gt;Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass&#xA;authorization headers in its requests:&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Database Configuration</title>
       <link>https://bmeg.github.io/grip/docs/databases/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>Developers</title>
       <link>https://bmeg.github.io/grip/docs/developers/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/developers/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>Download</title>
       <link>https://bmeg.github.io/grip/download/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/download/</guid>
-      <description> Download 0.7.0  Linux MacOS Windows is not supported sorry!  Release History See the Releases page for release history.
-Docker docker pull bmeg/grip docker run bmeg/grip grip server $ git clone https://github.com/bmeg/grip.git $ cd grip $ make </description>
+      <description>&lt;h3&gt;Download &lt;/h3&gt;&#xA;&#xA;&lt;ul&gt;&#xA;  &lt;li&gt;&lt;a href=&#34;https://github.com/bmeg/grip/releases/download//grip-linux-amd64-.tar.gz&#34;&gt;Linux&lt;/a&gt;&lt;/li&gt;&#xA;  &lt;li&gt;&lt;a href=&#34;https://github.com/bmeg/grip/releases/download//grip-darwin-amd64-.tar.gz&#34;&gt;MacOS&lt;/a&gt;&lt;/li&gt;&#xA;  &lt;li&gt;&lt;small&gt;Windows is not supported sorry!&lt;/small&gt;&lt;/li&gt;&#xA;&lt;/ul&gt;&#xA;&#xA;&lt;h3 id=&#34;release-history&#34;&gt;Release History&lt;/h3&gt;&#xA;&lt;p&gt;See the &lt;a href=&#34;https://github.com/bmeg/grip/releases&#34;&gt;Releases&lt;/a&gt; page for release history.&lt;/p&gt;&#xA;&lt;h2 id=&#34;docker&#34;&gt;Docker&lt;/h2&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-shell&#34; data-lang=&#34;shell&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;docker pull bmeg/grip&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;docker run bmeg/grip grip server&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;!-- raw HTML omitted --&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-shell&#34; data-lang=&#34;shell&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ git clone https://github.com/bmeg/grip.git&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ cd grip&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;$ make&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;</description>
     </item>
-    
     <item>
       <title>drop</title>
       <link>https://bmeg.github.io/grip/docs/commands/drop/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/drop/</guid>
-      <description>grip drop &amp;lt;graph&amp;gt; Deletes a graph.</description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip drop &amp;lt;graph&amp;gt;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Deletes a graph.&lt;/p&gt;</description>
     </item>
-    
-    <item>
-      <title>Elasticsearch</title>
-      <link>https://bmeg.github.io/grip/docs/databases/elastic/</link>
-      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
-      <guid>https://bmeg.github.io/grip/docs/databases/elastic/</guid>
-      <description>Elasticsearch GRIP supports storing vertices and edges in Elasticsearch.
-Config:
-Default: elastic Drivers: elastic: Elasticsearch: URL: &amp;#34;http://localhost:9200&amp;#34; DBName: &amp;#34;gripdb&amp;#34; Username: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; </description>
-    </item>
-    
     <item>
       <title>Embedded KV Store</title>
       <link>https://bmeg.github.io/grip/docs/databases/kvstore/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/kvstore/</guid>
-      <description>Embedded Key Value Stores GRIP supports storing vertices and edges in a variety of key-value stores including:
- Badger BoltDB LevelDB  Config:
-Default: kv Driver: kv: Badger: grip.db </description>
+      <description>&lt;h1 id=&#34;embedded-key-value-stores&#34;&gt;Embedded Key Value Stores&lt;/h1&gt;&#xA;&lt;p&gt;GRIP supports storing vertices and edges in a variety of key-value stores including:&lt;/p&gt;&#xA;&lt;ul&gt;&#xA;&lt;li&gt;&lt;a href=&#34;https://github.com/dgraph-io/badger&#34;&gt;Badger&lt;/a&gt;&lt;/li&gt;&#xA;&lt;li&gt;&lt;a href=&#34;https://github.com/boltdb/bolt&#34;&gt;BoltDB&lt;/a&gt;&lt;/li&gt;&#xA;&lt;li&gt;&lt;a href=&#34;https://github.com/syndtr/goleveldb&#34;&gt;LevelDB&lt;/a&gt;&lt;/li&gt;&#xA;&lt;/ul&gt;&#xA;&lt;p&gt;Config:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-yaml&#34; data-lang=&#34;yaml&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Default&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;kv&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Driver&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;kv&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    &lt;span style=&#34;color:#f92672&#34;&gt;Badger&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;grip.db&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;</description>
     </item>
-    
     <item>
       <title>er</title>
       <link>https://bmeg.github.io/grip/docs/commands/er/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/er/</guid>
-      <description>grip er The External Resource system allows GRIP to plug into existing data systems and integrate them into queriable graphs. The grip er sub command acts as a client to the external resource plugin proxies, issues command and displays the results. This is often useful for debugging external resources before making them part of an actual graph.
-List collections provided by external resource
-grip er list Get info about a collection</description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip er&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;The &lt;em&gt;External Resource&lt;/em&gt; system allows GRIP to plug into existing data systems and&#xA;integrate them into queriable graphs. The &lt;code&gt;grip er&lt;/code&gt; sub command acts as a client&#xA;to the external resource plugin proxies, issues command and displays the results.&#xA;This is often useful for debugging external resources before making them part of&#xA;an actual graph.&lt;/p&gt;&#xA;&lt;p&gt;List collections provided by external resource&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip er list&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Get info about a collection&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip er info&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;List ids from a collection&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>External Resource Proxies</title>
       <link>https://bmeg.github.io/grip/docs/gripper/proxy/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/gripper/proxy/</guid>
-      <description>GRIPPER GRIPPER proxy With the external resources normalized to a single data model, the graph model describes how to connect the set of collections into a graph model. Each GRIPPER is required to provide a GRPC interface that allows access to collections stored in the resource.
-The required functions include:
-rpc GetCollections(Empty) returns (stream Collection); GetCollections returns a list of all of the Collections accessible via this server.
-rpc GetCollectionInfo(Collection) returns (CollectionInfo); GetCollectionInfo provides information, such as the list of indexed fields, in a collection.</description>
+      <description>&lt;h1 id=&#34;gripper&#34;&gt;GRIPPER&lt;/h1&gt;&#xA;&lt;h2 id=&#34;gripper-proxy&#34;&gt;GRIPPER proxy&lt;/h2&gt;&#xA;&lt;p&gt;With the external resources normalized to a single data model, the graph model&#xA;describes how to connect the set of collections into a graph model. Each GRIPPER&#xA;is required to provide a GRPC interface that allows access to collections stored&#xA;in the resource.&lt;/p&gt;&#xA;&lt;p&gt;The required functions include:&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;rpc GetCollections(Empty) returns (stream Collection);&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;&lt;code&gt;GetCollections&lt;/code&gt; returns a list of all of the Collections accessible via this server.&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;rpc GetCollectionInfo(Collection) returns (CollectionInfo);&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;&lt;code&gt;GetCollectionInfo&lt;/code&gt; provides information, such as the list of indexed fields, in a collection.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Getting Started</title>
       <link>https://bmeg.github.io/grip/docs/queries/getting_started/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/queries/getting_started/</guid>
-      <description>Getting Started GRIP has an API for making graph queries using structured data. Queries are defined using a series of step operations.
-Install the Python Client Available on PyPI.
-pip install gripql Or install the latest development version:
-pip install &amp;quot;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&amp;quot; Using the Python Client Let&#39;s go through the features currently supported in the python client.
-First, import the client and create a connection to an GRIP server:
-import gripql G = gripql.</description>
+      <description>&lt;h1 id=&#34;getting-started&#34;&gt;Getting Started&lt;/h1&gt;&#xA;&lt;p&gt;GRIP has an API for making graph queries using structured data. Queries are defined using a series of step &lt;a href=&#34;https://bmeg.github.io/grip/docs/queries/operations&#34;&gt;operations&lt;/a&gt;.&lt;/p&gt;&#xA;&lt;h2 id=&#34;install-the-python-client&#34;&gt;Install the Python Client&lt;/h2&gt;&#xA;&lt;p&gt;Available on &lt;a href=&#34;https://pypi.org/project/gripql/&#34;&gt;PyPI&lt;/a&gt;.&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;pip install gripql&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Or install the latest development version:&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;pip install &amp;#34;git+https://github.com/bmeg/grip.git#subdirectory=gripql/python&amp;#34;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;h2 id=&#34;using-the-python-client&#34;&gt;Using the Python Client&lt;/h2&gt;&#xA;&lt;p&gt;Let&amp;rsquo;s go through the features currently supported in the python client.&lt;/p&gt;&#xA;&lt;p&gt;First, import the client and create a connection to an GRIP server:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;import&lt;/span&gt; gripql&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;G &lt;span style=&#34;color:#f92672&#34;&gt;=&lt;/span&gt; gripql&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;Connection(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;https://bmeg.io&amp;#34;&lt;/span&gt;)&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;graph(&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;bmeg&amp;#34;&lt;/span&gt;)&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Some GRIP servers may require authorizaiton to access its API endpoints. The client can be configured to pass&#xA;authorization headers in its requests.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Graph Model</title>
       <link>https://bmeg.github.io/grip/docs/gripper/graphmodel/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/gripper/graphmodel/</guid>
-      <description>GRIPPER GRIP Plugable External Resources
-Graph Model The graph model describes how GRIP will access multiple gripper servers. The mapping of these data resources is done using a graph. The vertices represent how each vertex type will be mapped, and the edges describe how edges will be created. The gid of each vertex represents the prefix domain of all vertices that can be found in that source.
-The sources referenced by the graph are provided to GRIP at run time, each named resource is a different GRIPPER plugin that abstracts an external resource.</description>
+      <description>&lt;h1 id=&#34;gripper&#34;&gt;GRIPPER&lt;/h1&gt;&#xA;&lt;p&gt;GRIP Plugable External Resources&lt;/p&gt;&#xA;&lt;h2 id=&#34;graph-model&#34;&gt;Graph Model&lt;/h2&gt;&#xA;&lt;p&gt;The graph model describes how GRIP will access multiple gripper servers. The mapping&#xA;of these data resources is done using a graph. The &lt;code&gt;vertices&lt;/code&gt; represent how each vertex&#xA;type will be mapped, and the &lt;code&gt;edges&lt;/code&gt; describe how edges will be created. The &lt;code&gt;gid&lt;/code&gt;&#xA;of each vertex represents the prefix domain of all vertices that can be found in that&#xA;source.&lt;/p&gt;&#xA;&lt;p&gt;The &lt;code&gt;sources&lt;/code&gt; referenced by the graph are provided to GRIP at run time, each named resource is a&#xA;different GRIPPER plugin that abstracts an external resource.&#xA;The &lt;code&gt;vertices&lt;/code&gt; section describes how different collections&#xA;found in these sources will be turned into Vertex found in the graph. Finally, the&#xA;&lt;code&gt;edges&lt;/code&gt; section describes the different kinds of rules that can be used build the&#xA;edges in the graph.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Graph Schemas</title>
       <link>https://bmeg.github.io/grip/docs/graphql/graph_schemas/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/graphql/graph_schemas/</guid>
-      <description>Graph Schemas Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires a graph schema as part of it&#39;s API. To utilize the GraphQL endpoint, there must be a Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint. Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.</description>
+      <description>&lt;h1 id=&#34;graph-schemas&#34;&gt;Graph Schemas&lt;/h1&gt;&#xA;&lt;p&gt;Most GRIP based graphs are not required to have a strict schema. However, GraphQL requires&#xA;a graph schema as part of it&amp;rsquo;s API. To utilize the GraphQL endpoint, there must be a&#xA;Graph Schema provided to be used by the GRIP engine to determine how to render a GraphQL endpoint.&#xA;Graph schemas are themselves an instance of a graph. As such, they can be traversed like any other graph.&#xA;The schemas are automatically added to the database following the naming pattern. &lt;code&gt;{graph-name}__schema__&lt;/code&gt;&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>GraphQL</title>
       <link>https://bmeg.github.io/grip/docs/graphql/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/graphql/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>GraphQL</title>
       <link>https://bmeg.github.io/grip/docs/graphql/graphql/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/graphql/graphql/</guid>
-      <description>GraphQL GraphQL support is considered Alpha. The code is not stable and the API will likely change. GraphQL access is only supported when using the MongoDB driver
-GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.
-Load built-in example graph Loading the example data and the example schema:
-grip load example-graph See the example graph
-grip dump example-graph --vertex --edge Sample components of the graph to produce a schema and store to a file</description>
+      <description>&lt;h1 id=&#34;graphql&#34;&gt;GraphQL&lt;/h1&gt;&#xA;&lt;p&gt;&lt;strong&gt;GraphQL support is considered Alpha. The code is not stable and the API will likely change.&lt;/strong&gt;&#xA;&lt;strong&gt;&lt;em&gt;GraphQL access is only supported when using the MongoDB driver&lt;/em&gt;&lt;/strong&gt;&lt;/p&gt;&#xA;&lt;p&gt;GRIP supports GraphQL access of the property graphs. Currently this is read-only access to the graph.&lt;/p&gt;&#xA;&lt;h3 id=&#34;load-built-in-example-graph&#34;&gt;Load built-in example graph&lt;/h3&gt;&#xA;&lt;p&gt;Loading the example data and the example schema:&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip load example-graph&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;See the example graph&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip dump example-graph --vertex --edge&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Sample components of the graph to produce a schema and store to a file&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>GRIP Commands</title>
       <link>https://bmeg.github.io/grip/docs/commands/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>GRIP Plugable External Resources</title>
       <link>https://bmeg.github.io/grip/docs/gripper/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/gripper/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>GRIPPER</title>
       <link>https://bmeg.github.io/grip/docs/databases/gripper/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/gripper/</guid>
-      <description>GRIPPER GRIP Plugable External Resources are data systems that GRIP can combine together to create graphs.
-Example:
-Drivers: swapi-driver: Gripper: ConfigFile: ./swapi.yaml Graph: swapi ConfigFile - Path to GRIPPER graph map
-Graph - Name of the graph for the mapped external resources.</description>
+      <description>&lt;h1 id=&#34;gripper&#34;&gt;GRIPPER&lt;/h1&gt;&#xA;&lt;p&gt;GRIP Plugable External Resources are data systems that GRIP can combine together&#xA;to create graphs.&lt;/p&gt;&#xA;&lt;p&gt;Example:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-yaml&#34; data-lang=&#34;yaml&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Drivers&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;swapi-driver&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    &lt;span style=&#34;color:#f92672&#34;&gt;Gripper&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;ConfigFile&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;./swapi.yaml&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Graph&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;swapi&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;&lt;code&gt;ConfigFile&lt;/code&gt; - Path to GRIPPER graph map&lt;/p&gt;&#xA;&lt;p&gt;&lt;code&gt;Graph&lt;/code&gt; - Name of the graph for the mapped external resources.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Intro</title>
       <link>https://bmeg.github.io/grip/docs/gripper/gripper/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/gripper/gripper/</guid>
-      <description>GRIPPER GRIP Plugin External Resources GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external resources and allow GRIP to access them are part of a unified graph. To integrate new resources into the graph, you first deploy griper proxies that plug into the external resources. They are unique and configured to access specific resources. These provide a view into external resources as a series of document collections. For example, an SQL gripper would plug into an SQL server and provide the tables as a set of collections with each every row a document.</description>
+      <description>&lt;h1 id=&#34;gripper&#34;&gt;GRIPPER&lt;/h1&gt;&#xA;&lt;h2 id=&#34;grip-plugin-external-resources&#34;&gt;GRIP Plugin External Resources&lt;/h2&gt;&#xA;&lt;p&gt;GRIP Plugin External Resources (GRIPPERs) are GRIP drivers that take external&#xA;resources and allow GRIP to access them are part of a unified graph.&#xA;To integrate new resources into the graph, you&#xA;first deploy griper proxies that plug into the external resources. They are unique&#xA;and configured to access specific resources. These provide a view into external&#xA;resources as a series of document collections. For example, an SQL gripper would&#xA;plug into an SQL server and provide the tables as a set of collections with each&#xA;every row a document. A gripper is written as a gRPC server.&lt;/p&gt;</description>
+    </item>
+    <item>
+      <title>Iteration</title>
+      <link>https://bmeg.github.io/grip/docs/queries/iterations/</link>
+      <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
+      <guid>https://bmeg.github.io/grip/docs/queries/iterations/</guid>
+      <description>&lt;h1 id=&#34;iteration-api&#34;&gt;Iteration API&lt;/h1&gt;&#xA;&lt;p&gt;A common operation in graph search is the ability to iterative repeat a search pattern.&#xA;For example, a &amp;lsquo;friend of a friend&amp;rsquo; search may become a &amp;lsquo;friend of a friend of a friend&amp;rsquo; search.&lt;/p&gt;&#xA;&lt;p&gt;In the GripQL language cycles, iterations and conditional operations are encoded using&#xA;&amp;lsquo;mark&amp;rsquo; and &amp;lsquo;jump&amp;rsquo; based interface. This operations are similar to using a &amp;lsquo;goto&amp;rsquo;&#xA;statement in a traditional programming language. While more primitive than the&#xA;repeat mechanisms seen in Gremlin, this pattern allows for a much more simple&#xA;query compilation and implementation.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Jobs API</title>
       <link>https://bmeg.github.io/grip/docs/queries/jobs_api/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/queries/jobs_api/</guid>
-      <description>Jobs API Not all queries return instantaneously, additionally some queries elements are used repeatedly. The query Jobs API provides a mechanism to submit graph traversals that will be evaluated asynchronously and can be retrieved at a later time.
-Submitting a job job = G.query().V().hasLabel(&amp;quot;Planet&amp;quot;).out().submit() Getting job status jinfo = G.getJob(job[&amp;quot;id&amp;quot;]) Example job info:
-{ &amp;#34;id&amp;#34;: &amp;#34;job-326392951&amp;#34;, &amp;#34;graph&amp;#34;: &amp;#34;test_graph_qd7rs7&amp;#34;, &amp;#34;state&amp;#34;: &amp;#34;COMPLETE&amp;#34;, &amp;#34;count&amp;#34;: &amp;#34;12&amp;#34;, &amp;#34;query&amp;#34;: [{&amp;#34;v&amp;#34;: []}, {&amp;#34;hasLabel&amp;#34;: [&amp;#34;Planet&amp;#34;]}, {&amp;#34;as&amp;#34;: &amp;#34;a&amp;#34;}, {&amp;#34;out&amp;#34;: []}], &amp;#34;timestamp&amp;#34;: &amp;#34;2021-03-30T23:12:01-07:00&amp;#34; } Reading job results for row in G.</description>
+      <description>&lt;h1 id=&#34;jobs-api&#34;&gt;Jobs API&lt;/h1&gt;&#xA;&lt;p&gt;Not all queries return instantaneously, additionally some queries elements are used&#xA;repeatedly. The query Jobs API provides a mechanism to submit graph traversals&#xA;that will be evaluated asynchronously and can be retrieved at a later time.&lt;/p&gt;&#xA;&lt;h3 id=&#34;submitting-a-job&#34;&gt;Submitting a job&lt;/h3&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;job = G.query().V().hasLabel(&amp;#34;Planet&amp;#34;).out().submit()&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;h3 id=&#34;getting-job-status&#34;&gt;Getting job status&lt;/h3&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;jinfo = G.getJob(job[&amp;#34;id&amp;#34;])&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Example job info:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-json&#34; data-lang=&#34;json&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;{&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;id&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;job-326392951&amp;#34;&lt;/span&gt;,&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;graph&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;test_graph_qd7rs7&amp;#34;&lt;/span&gt;,&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;state&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;COMPLETE&amp;#34;&lt;/span&gt;,&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;count&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;12&amp;#34;&lt;/span&gt;,&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;query&amp;#34;&lt;/span&gt;: [{&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;v&amp;#34;&lt;/span&gt;: []}, {&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;hasLabel&amp;#34;&lt;/span&gt;: [&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;Planet&amp;#34;&lt;/span&gt;]}, {&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;as&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;a&amp;#34;&lt;/span&gt;}, {&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;out&amp;#34;&lt;/span&gt;: []}],&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;timestamp&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;2021-03-30T23:12:01-07:00&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;}&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h3 id=&#34;reading-job-results&#34;&gt;Reading job results&lt;/h3&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;for row in G.readJob(job[&amp;#34;id&amp;#34;]):&#xA;   print(row)&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;h3 id=&#34;search-for-jobs&#34;&gt;Search for jobs&lt;/h3&gt;&#xA;&lt;p&gt;Find jobs that match the prefix of the current request (example should find job from G.query().V().hasLabel(&amp;ldquo;Planet&amp;rdquo;).out())&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>list</title>
       <link>https://bmeg.github.io/grip/docs/commands/list/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/list/</guid>
-      <description>grip list graphs grip list graphs </description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip list&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;h1 id=&#34;graphs&#34;&gt;graphs&lt;/h1&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip list graphs&#xA;&lt;/code&gt;&lt;/pre&gt;</description>
     </item>
-    
     <item>
       <title>MongoDB</title>
       <link>https://bmeg.github.io/grip/docs/databases/mongo/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/mongo/</guid>
-      <description>MongoDB GRIP supports storing vertices and edges in MongoDB.
-Config:
-Default: mongo Drivers: mongo: MongoDB: URL: &amp;#34;mongodb://localhost:27000&amp;#34; DBName: &amp;#34;gripdb&amp;#34; Username: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; UseCorePipeline: False BatchSize: 0 UseCorePipeline - Default is to use Mongo pipeline API to do graph traversals. By enabling UseCorePipeline, GRIP will do the traversal logic itself, only using Mongo for graph storage.
-BatchSize - For core engine operations, GRIP dispatches element lookups in batches to minimize query overhead.</description>
+      <description>&lt;h1 id=&#34;mongodb&#34;&gt;MongoDB&lt;/h1&gt;&#xA;&lt;p&gt;GRIP supports storing vertices and edges in &lt;a href=&#34;https://www.mongodb.com/&#34;&gt;MongoDB&lt;/a&gt;.&lt;/p&gt;&#xA;&lt;p&gt;Config:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-yaml&#34; data-lang=&#34;yaml&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Default&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;mongo&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Drivers&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;mongo&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    &lt;span style=&#34;color:#f92672&#34;&gt;MongoDB&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;URL&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;mongodb://localhost:27000&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;DBName&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;gripdb&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Username&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Password&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;UseCorePipeline&lt;/span&gt;: &lt;span style=&#34;color:#66d9ef&#34;&gt;False&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;BatchSize&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;0&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;&lt;code&gt;UseCorePipeline&lt;/code&gt; - Default is to use Mongo pipeline API to do graph traversals.&#xA;By enabling &lt;code&gt;UseCorePipeline&lt;/code&gt;, GRIP will do the traversal logic itself, only using&#xA;Mongo for graph storage.&lt;/p&gt;&#xA;&lt;p&gt;&lt;code&gt;BatchSize&lt;/code&gt; - For core engine operations, GRIP dispatches element lookups in&#xA;batches to minimize query overhead. If missing from config file (which defaults to 0)&#xA;the engine will default to 1000.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>mongoload</title>
       <link>https://bmeg.github.io/grip/docs/commands/mongoload/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/mongoload/</guid>
-      <description>grip mongoload </description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip mongoload&#xA;&lt;/code&gt;&lt;/pre&gt;</description>
     </item>
-    
     <item>
       <title>Operations</title>
       <link>https://bmeg.github.io/grip/docs/queries/operations/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/queries/operations/</guid>
-      <description>Start a Traversal .V([ids]) Start query from Vertex
-G.query().V() Returns all vertices in graph
-G.query().V([&amp;#34;vertex1]&amp;#34;) Returns:
-{&amp;#34;gid&amp;#34; : &amp;#34;vertex1&amp;#34;, &amp;#34;label&amp;#34;:&amp;#34;TestVertex&amp;#34;, &amp;#34;data&amp;#34;:{}} .E([ids]) Start query from Edge
-G.query().E() Returns all edges in graph
-G.query().E([&amp;#34;edge1&amp;#34;]) Returns:
-{&amp;#34;gid&amp;#34; : &amp;#34;edge1&amp;#34;, &amp;#34;label&amp;#34;:&amp;#34;TestEdge&amp;#34;, From: &amp;#34;vertex1&amp;#34;, To: &amp;#34;vertex2&amp;#34;, data&amp;#34;:{}} Traverse the graph .in_(), inV() Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.</description>
+      <description>&lt;h1 id=&#34;start-a-traversal&#34;&gt;Start a Traversal&lt;/h1&gt;&#xA;&lt;h2 id=&#34;vids&#34;&gt;.V([ids])&lt;/h2&gt;&#xA;&lt;p&gt;Start query from Vertex&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;G&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;V()&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Returns all vertices in graph&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;G&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;V([&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;vertex1&amp;#34;&lt;/span&gt;])&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Returns:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-json&#34; data-lang=&#34;json&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;{&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;gid&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;vertex1&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;label&amp;#34;&lt;/span&gt;:&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;TestVertex&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;data&amp;#34;&lt;/span&gt;:{}}&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h2 id=&#34;eids&#34;&gt;.E([ids])&lt;/h2&gt;&#xA;&lt;p&gt;Start query from Edge&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;G&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;E()&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Returns all edges in graph&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-python&#34; data-lang=&#34;python&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;G&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;query()&lt;span style=&#34;color:#f92672&#34;&gt;.&lt;/span&gt;E([&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;edge1&amp;#34;&lt;/span&gt;])&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;p&gt;Returns:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-json&#34; data-lang=&#34;json&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;{&lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;gid&amp;#34;&lt;/span&gt; : &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;edge1&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;label&amp;#34;&lt;/span&gt;:&lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;TestEdge&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;from&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;vertex1&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;to&amp;#34;&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;vertex2&amp;#34;&lt;/span&gt;, &lt;span style=&#34;color:#f92672&#34;&gt;&amp;#34;data&amp;#34;&lt;/span&gt;:{}}&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;&lt;h1 id=&#34;traverse-the-graph&#34;&gt;Traverse the graph&lt;/h1&gt;&#xA;&lt;h2 id=&#34;in_-inv&#34;&gt;.in_(), inV()&lt;/h2&gt;&#xA;&lt;p&gt;Following incoming edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all incoming edges.&lt;/p&gt;&#xA;&lt;h2 id=&#34;out-outv&#34;&gt;.out(), .outV()&lt;/h2&gt;&#xA;&lt;p&gt;Following outgoing edges. Optional argument is the edge label (or list of labels) that should be followed. If no argument is provided, all outgoing edges.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Overview</title>
       <link>https://bmeg.github.io/grip/docs/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/</guid>
-      <description>Overview GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including: MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
-Properties of an GRIP graph:
- Both vertices and edges in a graph can have any number of properties associated with them. There are many types of vertices and edges in a graph. Two vertices may have many types of edges connecting them, thus reflecting a myriad of relationship types.</description>
+      <description>&lt;h1 id=&#34;overview&#34;&gt;Overview&lt;/h1&gt;&#xA;&lt;p&gt;GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including:&#xA;MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.&lt;/p&gt;&#xA;&lt;p&gt;Properties of an GRIP graph:&lt;/p&gt;&#xA;&lt;ul&gt;&#xA;&lt;li&gt;Both vertices and edges in a graph can have any number of properties associated with them.&lt;/li&gt;&#xA;&lt;li&gt;There are many types of vertices and edges in a graph. Two vertices may have many types of edges&#xA;connecting them, thus reflecting a myriad of relationship types.&lt;/li&gt;&#xA;&lt;li&gt;Edges in the graph are directed, meaning they have a source and destination.&lt;/li&gt;&#xA;&lt;/ul&gt;&#xA;&lt;p&gt;GRIP also provides a query API for the traversing, analyzing and manipulating your graphs. Its syntax is inspired by&#xA;&lt;a href=&#34;http://tinkerpop.apache.org/&#34;&gt;Apache TinkerPop&lt;/a&gt;. Learn more &lt;a href=&#34;https://bmeg.github.io/grip/docs/queries/getting_started&#34;&gt;here&lt;/a&gt; about GRIP and its&#xA;application for querying the Bio Medical Evidence Graph (&lt;a href=&#34;https://bmeg.io&#34;&gt;BMEG&lt;/a&gt;).&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>PostgreSQL</title>
       <link>https://bmeg.github.io/grip/docs/databases/psql/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/psql/</guid>
-      <description>PostgreSQL GRIP supports storing vertices and edges in PostgreSQL.
-Config:
-Default: psql Drivers: psql: PSQL: Host: localhost Port: 15432 User: &amp;#34;&amp;#34; Password: &amp;#34;&amp;#34; DBName: &amp;#34;grip&amp;#34; SSLMode: disable </description>
+      <description>&lt;h1 id=&#34;postgresql&#34;&gt;PostgreSQL&lt;/h1&gt;&#xA;&lt;p&gt;GRIP supports storing vertices and edges in &lt;a href=&#34;https://www.postgresql.org/&#34;&gt;PostgreSQL&lt;/a&gt;.&lt;/p&gt;&#xA;&lt;p&gt;Config:&lt;/p&gt;&#xA;&lt;div class=&#34;highlight&#34;&gt;&lt;pre tabindex=&#34;0&#34; style=&#34;color:#f8f8f2;background-color:#272822;-moz-tab-size:4;-o-tab-size:4;tab-size:4;&#34;&gt;&lt;code class=&#34;language-yaml&#34; data-lang=&#34;yaml&#34;&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Default&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;psql&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;&lt;span style=&#34;color:#f92672&#34;&gt;Drivers&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;  &lt;span style=&#34;color:#f92672&#34;&gt;psql&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;    &lt;span style=&#34;color:#f92672&#34;&gt;PSQL&lt;/span&gt;:&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Host&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;localhost&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Port&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;15432&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;User&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;Password&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;DBName&lt;/span&gt;: &lt;span style=&#34;color:#e6db74&#34;&gt;&amp;#34;grip&amp;#34;&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;span style=&#34;display:flex;&#34;&gt;&lt;span&gt;      &lt;span style=&#34;color:#f92672&#34;&gt;SSLMode&lt;/span&gt;: &lt;span style=&#34;color:#ae81ff&#34;&gt;disable&lt;/span&gt;&#xA;&lt;/span&gt;&lt;/span&gt;&lt;/code&gt;&lt;/pre&gt;&lt;/div&gt;</description>
     </item>
-    
     <item>
       <title>query</title>
       <link>https://bmeg.github.io/grip/docs/commands/query/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/query/</guid>
-      <description>grip query &amp;lt;graph&amp;gt; &amp;lt;query&amp;gt; Run a query on a graph.</description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip query &amp;lt;graph&amp;gt; &amp;lt;query&amp;gt;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Run a query on a graph.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Query a Graph</title>
       <link>https://bmeg.github.io/grip/docs/queries/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/queries/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>Referencing Fields</title>
       <link>https://bmeg.github.io/grip/docs/queries/jsonpath/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/queries/jsonpath/</guid>
-      <description>Referencing Vertex/Edge Properties Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal. GRIP uses a variation on JSONPath syntax as described in http://goessner.net/articles/ to reference fields during traversals.
-The following query:
-O.query().V([&amp;quot;ENSG00000012048&amp;quot;]).as_(&amp;quot;gene&amp;quot;).out(&amp;quot;variant&amp;quot;) Starts at vertex ENSG00000012048 and marks as gene:
-{ &amp;quot;gid&amp;quot;: &amp;quot;ENSG00000012048&amp;quot;, &amp;quot;label&amp;quot;: &amp;quot;gene&amp;quot;, &amp;quot;data&amp;quot;: { &amp;quot;symbol&amp;quot;: { &amp;quot;ensembl&amp;quot;: &amp;quot;ENSG00000012048&amp;quot;, &amp;quot;hgnc&amp;quot;: 1100, &amp;quot;entrez&amp;quot;: 672, &amp;quot;hugo&amp;quot;: &amp;quot;BRCA1&amp;quot; } &amp;quot;transcipts&amp;quot;: [&amp;quot;ENST00000471181.7&amp;quot;, &amp;quot;ENST00000357654.8&amp;quot;, &amp;quot;ENST00000493795.5&amp;quot;] } } as &amp;ldquo;gene&amp;rdquo; and traverses the graph to:</description>
+      <description>&lt;h1 id=&#34;referencing-vertexedge-properties&#34;&gt;Referencing Vertex/Edge Properties&lt;/h1&gt;&#xA;&lt;p&gt;Several operations (where, fields, render, etc.) reference properties of the vertices/edges during the traversal.&#xA;GRIP uses a variation on JSONPath syntax as described in &lt;a href=&#34;http://goessner.net/articles/&#34;&gt;http://goessner.net/articles/&lt;/a&gt; to reference fields during traversals.&lt;/p&gt;&#xA;&lt;p&gt;The following query:&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;O.query().V([&amp;#34;ENSG00000012048&amp;#34;]).as_(&amp;#34;gene&amp;#34;).out(&amp;#34;variant&amp;#34;)&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Starts at vertex &lt;code&gt;ENSG00000012048&lt;/code&gt; and marks as &lt;code&gt;gene&lt;/code&gt;:&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;{&#xA;  &amp;#34;gid&amp;#34;: &amp;#34;ENSG00000012048&amp;#34;,&#xA;  &amp;#34;label&amp;#34;: &amp;#34;gene&amp;#34;,&#xA;  &amp;#34;data&amp;#34;: {&#xA;    &amp;#34;symbol&amp;#34;: {&#xA;      &amp;#34;ensembl&amp;#34;: &amp;#34;ENSG00000012048&amp;#34;,&#xA;      &amp;#34;hgnc&amp;#34;: 1100,&#xA;      &amp;#34;entrez&amp;#34;: 672,&#xA;      &amp;#34;hugo&amp;#34;: &amp;#34;BRCA1&amp;#34;&#xA;    }&#xA;    &amp;#34;transcipts&amp;#34;: [&amp;#34;ENST00000471181.7&amp;#34;, &amp;#34;ENST00000357654.8&amp;#34;, &amp;#34;ENST00000493795.5&amp;#34;]&#xA;  }&#xA;}&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;as &amp;ldquo;gene&amp;rdquo; and traverses the graph to:&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Security</title>
       <link>https://bmeg.github.io/grip/docs/security/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/security/</guid>
       <description></description>
     </item>
-    
     <item>
       <title>server</title>
       <link>https://bmeg.github.io/grip/docs/commands/server/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/commands/server/</guid>
-      <description>grip server The server command starts up a graph server and waits for incoming requests.
-Default Configuration If invoked with no arguments or config files, GRIP will start up in embedded mode, using a Badger based graph driver.
-Networking By default the GRIP server operates on 2 ports, 8201 is the HTTP based interface. Port 8202 is a GRPC based interface. Python, R and Javascript clients are designed to connect to the HTTP interface on 8201.</description>
+      <description>&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip server&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;The server command starts up a graph server and waits for incoming requests.&lt;/p&gt;&#xA;&lt;h2 id=&#34;default-configuration&#34;&gt;Default Configuration&lt;/h2&gt;&#xA;&lt;p&gt;If invoked with no arguments or config files, GRIP will start up in embedded mode,&#xA;using a Badger based graph driver.&lt;/p&gt;&#xA;&lt;h2 id=&#34;networking&#34;&gt;Networking&lt;/h2&gt;&#xA;&lt;p&gt;By default the GRIP server operates on 2 ports, &lt;code&gt;8201&lt;/code&gt; is the HTTP based interface.&#xA;Port &lt;code&gt;8202&lt;/code&gt; is a GRPC based interface. Python, R and Javascript clients are designed&#xA;to connect to the HTTP interface on &lt;code&gt;8201&lt;/code&gt;. The &lt;code&gt;grip&lt;/code&gt; command will often use&#xA;port &lt;code&gt;8202&lt;/code&gt; in order to complete operations. For example if you call &lt;code&gt;grip list graphs&lt;/code&gt;&#xA;it will contact port &lt;code&gt;8202&lt;/code&gt;, rather then using the HTTP port. This means that if&#xA;you are working with a server that is behind a firewall, and only the HTTP port is&#xA;available, then the grip command line program will not be able to issue commands,&#xA;even if the server is visible to client libraries.&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>SQL</title>
       <link>https://bmeg.github.io/grip/docs/databases/sql/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/databases/sql/</guid>
-      <description>Connect to an existing SQL database Note: This driver is being superseded by the GRIPPER engine
-GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against PostgreSQL, but should work with MySQL (4.1+) and MariaDB.
-Since GRIP uses Go&#39;s database/sql package, we could (in thoery) support any SQL databases listed on: https://github.com/golang/go/wiki/SQLDrivers. Open an issue if you would like to request support for your favorite SQL database.</description>
+      <description>&lt;h1 id=&#34;connect-to-an-existing-sql-database&#34;&gt;Connect to an existing SQL database&lt;/h1&gt;&#xA;&lt;p&gt;Note: This driver is being superseded by the &lt;a href=&#34;https://bmeg.github.io/grip/docs/gripper/gripper/&#34;&gt;GRIPPER engine&lt;/a&gt;&lt;/p&gt;&#xA;&lt;p&gt;GRIP supports modeling an existing SQL database as a graph. GRIP has been tested against &lt;a href=&#34;https://www.postgresql.org/&#34;&gt;PostgreSQL&lt;/a&gt;, but should  work with&#xA;&lt;a href=&#34;https://www.mysql.com/&#34;&gt;MySQL&lt;/a&gt; (4.1+) and &lt;a href=&#34;https://mariadb.org/&#34;&gt;MariaDB&lt;/a&gt;.&lt;/p&gt;&#xA;&lt;p&gt;Since GRIP uses Go&amp;rsquo;s &lt;code&gt;database/sql&lt;/code&gt; package, we could (in thoery) support any SQL databases listed on:&#xA;&lt;a href=&#34;https://github.com/golang/go/wiki/SQLDrivers&#34;&gt;https://github.com/golang/go/wiki/SQLDrivers&lt;/a&gt;. Open an &lt;a href=&#34;https://github.com/bmeg/grip/issues/new&#34;&gt;issue&lt;/a&gt; if you&#xA;would like to request support for your favorite SQL database.&lt;/p&gt;&#xA;&lt;h2 id=&#34;configuration-notes&#34;&gt;Configuration Notes&lt;/h2&gt;&#xA;&lt;ul&gt;&#xA;&lt;li&gt;&#xA;&lt;p&gt;&lt;code&gt;DataSourceName&lt;/code&gt; is a driver-specific data source name, usually consisting of at least a database name and connection information. Here are links for&#xA;to documentation for this field for each supported driver:&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>TCGA RNA Expression</title>
       <link>https://bmeg.github.io/grip/docs/tutorials/tcga-rna/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/tutorials/tcga-rna/</guid>
-      <description>Explore TCGA RNA Expression Data Create the graph
-grip create tcga-rna Get the data
-curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz tar xvzf gbm_tcga_pub2013.tar.gz Load clinical data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &#39;Donor&#39; Load RNASeq data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --row-label RNASeq --row-prefix &amp;quot;RNA:&amp;quot; --exclude RNA:Hugo_Symbol Connect RNASeq data to Clinical data
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t --index-col 1 --no-vertex --edge &#39;RNA:{_gid}&#39; rna Connect Clinical data to subtypes
-./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &amp;quot;{EXPRESSION_SUBTYPE}&amp;quot; subtype --dst-vertex &amp;quot;{EXPRESSION_SUBTYPE}&amp;quot; Subtype Load Hugo Symbol to EntrezID translation table from RNA matrix annotations</description>
+      <description>&lt;h3 id=&#34;explore-tcga-rna-expression-data&#34;&gt;Explore TCGA RNA Expression Data&lt;/h3&gt;&#xA;&lt;p&gt;Create the graph&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;grip create tcga-rna&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Get the data&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;curl -O http://download.cbioportal.org/gbm_tcga_pub2013.tar.gz&#xA;tar xvzf gbm_tcga_pub2013.tar.gz&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Load clinical data&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --row-label &amp;#39;Donor&amp;#39;&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Load RNASeq data&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --row-label RNASeq --row-prefix &amp;#34;RNA:&amp;#34; --exclude RNA:Hugo_Symbol&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Connect RNASeq data to Clinical data&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_RNA_Seq_v2_expression_median.txt -t  --index-col 1 --no-vertex --edge &amp;#39;RNA:{_gid}&amp;#39; rna&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Connect Clinical data to subtypes&lt;/p&gt;&#xA;&lt;pre tabindex=&#34;0&#34;&gt;&lt;code&gt;./example/load_matrix.py tcga-rna gbm_tcga_pub2013/data_clinical.txt --no-vertex -e &amp;#34;{EXPRESSION_SUBTYPE}&amp;#34; subtype --dst-vertex &amp;#34;{EXPRESSION_SUBTYPE}&amp;#34; Subtype&#xA;&lt;/code&gt;&lt;/pre&gt;&lt;p&gt;Load Hugo Symbol to EntrezID translation table from RNA matrix annotations&lt;/p&gt;</description>
     </item>
-    
     <item>
       <title>Tutorials</title>
       <link>https://bmeg.github.io/grip/docs/tutorials/</link>
       <pubDate>Mon, 01 Jan 0001 00:00:00 +0000</pubDate>
-      
       <guid>https://bmeg.github.io/grip/docs/tutorials/</guid>
       <description></description>
     </item>
-    
   </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/docs/sitemap.xml b/docs/sitemap.xml
index 156102e0..8fefa22c 100644
--- a/docs/sitemap.xml
+++ b/docs/sitemap.xml
@@ -1,162 +1,81 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
-  
   <url>
     <loc>https://bmeg.github.io/grip/docs/tutorials/pathway-commons/</loc>
-    <priority>0</priority>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/tutorials/amazon/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/security/basic/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/categories/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/developers/</loc>
-  </url>
-  
-  <url>
-    <loc>https://bmeg.github.io/grip/docs/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/download/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/drop/</loc>
-  </url>
-  
-  <url>
-    <loc>https://bmeg.github.io/grip/docs/databases/elastic/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/kvstore/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/er/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/gripper/proxy/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/queries/getting_started/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/gripper/graphmodel/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/graphql/graph_schemas/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/graphql/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/graphql/graphql/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/gripper/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/gripper/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/gripper/gripper/</loc>
-  </url>
-  
-  <url>
+  </url><url>
+    <loc>https://bmeg.github.io/grip/docs/queries/iterations/</loc>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/queries/jobs_api/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/list/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/mongo/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/mongoload/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/queries/operations/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/psql/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/query/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/queries/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/queries/jsonpath/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/security/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/commands/server/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/databases/sql/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/tags/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/tutorials/tcga-rna/</loc>
-  </url>
-  
-  <url>
+  </url><url>
     <loc>https://bmeg.github.io/grip/docs/tutorials/</loc>
   </url>
-  
-</urlset>
\ No newline at end of file
+</urlset>
diff --git a/docs/tags/index.xml b/docs/tags/index.xml
index 4ddab99c..87097426 100644
--- a/docs/tags/index.xml
+++ b/docs/tags/index.xml
@@ -4,11 +4,8 @@
     <title>Tags on GRIP</title>
     <link>https://bmeg.github.io/grip/tags/</link>
     <description>Recent content in Tags on GRIP</description>
-    <generator>Hugo -- gohugo.io</generator>
+    <generator>Hugo</generator>
     <language>en-us</language>
-    
-	<atom:link href="https://bmeg.github.io/grip/tags/index.xml" rel="self" type="application/rss+xml" />
-    
-    
+    <atom:link href="https://bmeg.github.io/grip/tags/index.xml" rel="self" type="application/rss+xml" />
   </channel>
-</rss>
\ No newline at end of file
+</rss>
diff --git a/elastic/convert.go b/elastic/convert.go
deleted file mode 100644
index d44afa61..00000000
--- a/elastic/convert.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package elastic
-
-import (
-	"github.com/bmeg/grip/gdbi"
-	"github.com/bmeg/grip/gripql"
-	"google.golang.org/protobuf/types/known/structpb"
-)
-
-// PackVertex take a gdbi vertex and convert it to a mongo doc
-func PackVertex(v *gdbi.Vertex) map[string]interface{} {
-	return map[string]interface{}{
-		"gid":   v.ID,
-		"label": v.Label,
-		"data":  v.Data,
-	}
-}
-
-// PackEdge takes a AQL edge and converts it to a mongo doc
-func PackEdge(e *gdbi.Edge) map[string]interface{} {
-	return map[string]interface{}{
-		"gid":   e.ID,
-		"from":  e.From,
-		"to":    e.To,
-		"label": e.Label,
-		"data":  e.Data,
-	}
-}
-
-// UnpackVertex takes a mongo doc and converts it into an gripql.Vertex
-func UnpackVertex(i map[string]interface{}) *gripql.Vertex {
-	o := &gripql.Vertex{}
-	o.Gid = i["gid"].(string)
-	o.Label = i["label"].(string)
-	if p, ok := i["data"]; ok {
-		o.Data, _ = structpb.NewStruct(p.(map[string]interface{}))
-	}
-	return o
-}
-
-// UnpackEdge takes a mongo doc and convertes it into an gripql.Edge
-func UnpackEdge(i map[string]interface{}) *gripql.Edge {
-	o := &gripql.Edge{}
-	o.Gid = i["gid"].(string)
-	o.Label = i["label"].(string)
-	o.From = i["from"].(string)
-	o.To = i["to"].(string)
-	if d, ok := i["data"]; ok {
-		o.Data, _ = structpb.NewStruct(d.(map[string]interface{}))
-	}
-	return o
-}
diff --git a/elastic/graph.go b/elastic/graph.go
deleted file mode 100644
index f23e9af4..00000000
--- a/elastic/graph.go
+++ /dev/null
@@ -1,888 +0,0 @@
-package elastic
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/bmeg/grip/engine/core"
-	"github.com/bmeg/grip/gdbi"
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/bmeg/grip/timestamp"
-	"github.com/bmeg/grip/util"
-	"golang.org/x/sync/errgroup"
-	"google.golang.org/protobuf/encoding/protojson"
-	elastic "gopkg.in/olivere/elastic.v5"
-)
-
-var excludeData = elastic.NewFetchSourceContext(true).Exclude("data")
-
-// Graph is a graph database backended by elastic search
-type Graph struct {
-	ts          *timestamp.Timestamp
-	client      *elastic.Client
-	graph       string
-	vertexIndex string
-	edgeIndex   string
-	// Used to batch queries from incoming channels
-	batchSize int
-	// Not recommended for production. Refresh the relevant primary and replica shards (not the
-	// whole index) immediately after the operation occurs, so that the updated
-	// document appears in search results immediately.
-	synchronous bool
-	pageSize    int
-}
-
-// Compiler returns a query compiler that will use elastic search as a backend
-func (es *Graph) Compiler() gdbi.Compiler {
-	return core.NewCompiler(es, core.IndexStartOptimize) //TODO: probably a better optimizer for vertex label search
-}
-
-// GetTimestamp returns the change timestamp of the current graph
-func (es *Graph) GetTimestamp() string {
-	return es.ts.Get(es.graph)
-}
-
-// AddEdge adds an edge to the graph, if the id is not "" and in already exists
-// in the graph, it is replaced
-func (es *Graph) AddEdge(edges []*gdbi.Edge) error {
-	ctx := context.Background()
-
-	bulkRequest := es.client.Bulk()
-	if es.synchronous {
-		bulkRequest = bulkRequest.Refresh("true")
-	}
-	for _, e := range edges {
-		if e.ID == "" {
-			return fmt.Errorf("edge gid cannot be an empty string")
-		}
-		pe := PackEdge(e)
-		script := elastic.NewScript(`ctx._source.gid = params.gid;
-                                 ctx._source.label = params.label;
-                                 ctx._source.from = params.from;
-                                 ctx._source.to = params.to;
-                                 ctx._source.data = params.data;`).Params(pe)
-		req := elastic.NewBulkUpdateRequest().
-			Index(es.edgeIndex).
-			Type("edge").
-			Id(e.ID).
-			Script(script).
-			Upsert(pe)
-		bulkRequest = bulkRequest.Add(req)
-	}
-	_, err := bulkRequest.Do(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to add edge: %s", err)
-	}
-	es.ts.Touch(es.graph)
-	return nil
-}
-
-// AddVertex adds an edge to the graph, if the id is not "" and in already exists
-// in the graph, it is replaced
-func (es *Graph) AddVertex(vertices []*gdbi.Vertex) error {
-	ctx := context.Background()
-
-	bulkRequest := es.client.Bulk()
-	if es.synchronous {
-		bulkRequest = bulkRequest.Refresh("true")
-	}
-	for _, v := range vertices {
-		if v.ID == "" {
-			return fmt.Errorf("vertex gid cannot be an empty string")
-		}
-		pv := PackVertex(v)
-		script := elastic.NewScript(`ctx._source.gid = params.gid;
-                                 ctx._source.label = params.label;
-                                 ctx._source.data = params.data;`).Params(pv)
-		req := elastic.NewBulkUpdateRequest().
-			Index(es.vertexIndex).
-			Type("vertex").
-			Id(v.ID).
-			Script(script).
-			Upsert(pv)
-		bulkRequest = bulkRequest.Add(req)
-	}
-	_, err := bulkRequest.Do(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to add vertex: %s", err)
-	}
-	es.ts.Touch(es.graph)
-	return nil
-}
-
-func (es *Graph) BulkAdd(stream <-chan *gdbi.GraphElement) error {
-	return util.StreamBatch(stream, 50, es.graph, es.AddVertex, es.AddEdge)
-}
-
-func (es *Graph) BulkDel(Data *gdbi.DeleteData) error {
-	for _, v := range Data.Edges {
-		if err := es.DelEdge(v); err != nil {
-			return err
-		}
-	}
-	for _, v := range Data.Vertices {
-		if err := es.DelVertex(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// DelEdge deletes edge `eid`
-func (es *Graph) DelEdge(eid string) error {
-	ctx := context.Background()
-	op := es.client.Delete()
-	if es.synchronous {
-		op = op.Refresh("true")
-	}
-	_, err := op.Index(es.edgeIndex).Type("edge").Id(eid).Do(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to delete edge %s: %s", eid, err)
-	}
-	es.ts.Touch(es.graph)
-	return nil
-}
-
-// deleteConnectedEdges deletes edges where `from` or `to` equal `vid`
-func (es *Graph) deleteConnectedEdges(vid string) error {
-	ctx := context.Background()
-
-	op := es.client.DeleteByQuery()
-	if es.synchronous {
-		op = op.Refresh("true")
-	}
-	op = op.Index(es.edgeIndex).Type("edge").Query(
-		elastic.NewBoolQuery().Should(elastic.NewTermQuery("from", vid), elastic.NewTermQuery("to", vid)),
-	)
-	_, err := op.Do(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to delete edge(s): %s", err)
-	}
-	es.ts.Touch(es.graph)
-	return nil
-}
-
-// DelVertex deletes vertex `vid` and all adjacent edges
-func (es *Graph) DelVertex(vid string) error {
-	ctx := context.Background()
-	op := es.client.Delete()
-	if es.synchronous {
-		op = op.Refresh("true")
-	}
-	_, err := op.Index(es.vertexIndex).Type("vertex").Id(vid).Do(ctx)
-	if err != nil {
-		return fmt.Errorf("failed to delete vertex %s: %s", vid, err)
-	}
-	es.ts.Touch(es.graph)
-	err = es.deleteConnectedEdges(vid)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// GetEdge gets a specific edge
-func (es *Graph) GetEdge(id string, load bool) *gdbi.Edge {
-	ctx := context.Background()
-
-	g := es.client.Get().Index(es.edgeIndex).Id(id)
-	if !load {
-		g = g.FetchSource(true).FetchSourceContext(excludeData)
-	}
-
-	res, err := g.Do(ctx)
-	if err != nil {
-		log.WithFields(log.Fields{"error": err}).Error("GetEdge")
-		return nil
-	}
-
-	edge := &gripql.Edge{}
-	err = protojson.Unmarshal(*res.Source, edge)
-	if err != nil {
-		log.WithFields(log.Fields{"error": err}).Error("GetEdge: unmarshal")
-		return nil
-	}
-	o := gdbi.NewElementFromEdge(edge)
-	o.Loaded = load
-	return o
-}
-
-// GetVertex gets vertex `id`
-func (es *Graph) GetVertex(id string, load bool) *gdbi.Vertex {
-	ctx := context.Background()
-
-	g := es.client.Get().Index(es.vertexIndex).Id(id)
-	if !load {
-		g = g.FetchSource(true).FetchSourceContext(excludeData)
-	}
-
-	res, err := g.Do(ctx)
-	if err != nil {
-		log.WithFields(log.Fields{"error": err}).Error("GetVertex")
-		return nil
-	}
-
-	vertex := &gripql.Vertex{}
-	err = protojson.Unmarshal(*res.Source, vertex)
-	if err != nil {
-		log.WithFields(log.Fields{"error": err}).Error("GetVertex: unmarshal")
-		return nil
-	}
-
-	o := gdbi.NewElementFromVertex(vertex)
-	o.Loaded = load
-	return o
-}
-
-// GetEdgeList produces a channel of all edges in the graph
-func (es *Graph) GetEdgeList(ctx context.Context, load bool) <-chan *gdbi.Edge {
-	o := make(chan *gdbi.Edge, 100)
-
-	// 1st goroutine sends individual hits to channel.
-	hits := make(chan json.RawMessage, es.pageSize)
-	g, ctx := errgroup.WithContext(ctx)
-	g.Go(func() error {
-		defer close(hits)
-		scroll := es.client.Scroll(es.edgeIndex).Sort("gid", true).Size(es.pageSize)
-		if !load {
-			scroll = scroll.FetchSource(true).FetchSourceContext(excludeData)
-		}
-		for {
-			results, err := scroll.Do(ctx)
-			if err == io.EOF {
-				return nil // all results retrieved
-			}
-			if err != nil {
-				return fmt.Errorf("scroll call failed: %v", err)
-			}
-
-			// Send the hits to the hits channel
-			for _, hit := range results.Hits.Hits {
-				hits <- *hit.Source
-			}
-		}
-	})
-
-	// 2nd goroutine receives hits and deserializes them.
-	g.Go(func() error {
-		for hit := range hits {
-			edge := &gripql.Edge{}
-			err := protojson.Unmarshal(hit, edge)
-			if err != nil {
-				return err
-			}
-			i := gdbi.NewElementFromEdge(edge)
-			i.Loaded = load
-			o <- i
-		}
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetEdgeList")
-		}
-	}()
-
-	return o
-}
-
-// GetVertexList produces a channel of all vertices in the graph
-func (es *Graph) GetVertexList(ctx context.Context, load bool) <-chan *gdbi.Vertex {
-	o := make(chan *gdbi.Vertex, es.pageSize)
-
-	// 1st goroutine sends individual hits to channel.
-	hits := make(chan json.RawMessage, es.pageSize)
-	g, ctx := errgroup.WithContext(ctx)
-	g.Go(func() error {
-		defer close(hits)
-		scroll := es.client.Scroll(es.vertexIndex).Sort("gid", true).Size(es.pageSize)
-		if !load {
-			scroll = scroll.FetchSource(true).FetchSourceContext(excludeData)
-		}
-		for {
-			results, err := scroll.Do(ctx)
-			if err == io.EOF {
-				return nil // all results retrieved
-			}
-			if err != nil {
-				return fmt.Errorf("scroll call failed: %v", err)
-			}
-
-			// Send the hits to the hits channel
-			for _, hit := range results.Hits.Hits {
-				hits <- *hit.Source
-			}
-		}
-	})
-
-	// 2nd goroutine receives hits and deserializes them.
-	g.Go(func() error {
-		for hit := range hits {
-			vertex := &gripql.Vertex{}
-			err := protojson.Unmarshal(hit, vertex)
-			if err != nil {
-				return fmt.Errorf("failed to unmarshal vertex: %v", err)
-			}
-			i := gdbi.NewElementFromVertex(vertex)
-			i.Loaded = load
-			o <- i
-		}
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetVertexList")
-		}
-	}()
-
-	return o
-}
-
-// GetVertexChannel get a channel that returns all vertices in a graph
-func (es *Graph) GetVertexChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool) chan gdbi.ElementLookup {
-	g, ctx := errgroup.WithContext(ctx)
-
-	// Create query batches
-	batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond)
-
-	// Find all vertices
-	o := make(chan gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		for batch := range batches {
-			idBatch := make([]string, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					idBatch = append(idBatch, batch[i].ID)
-					batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i])
-				}
-			}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.vertexIndex).Size(es.pageSize)
-				q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...)))
-				if !load {
-					q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data"))
-				}
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					vertex := &gripql.Vertex{}
-					err := protojson.Unmarshal(*hit.Source, vertex)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal vertex: %s", err)
-					}
-					r := batchMap[vertex.Gid]
-					for _, ri := range r {
-						ri.Vertex = gdbi.NewElementFromVertex(vertex)
-						o <- ri
-					}
-				}
-			}
-			for i := range signals {
-				o <- signals[i]
-			}
-		}
-
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetVertexChannel")
-		}
-	}()
-
-	return o
-}
-
-// GetOutChannel gets channel of all vertices connected to element via outgoing edge
-func (es *Graph) GetOutChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup {
-	g, ctx := errgroup.WithContext(ctx)
-
-	// Create query batches
-	batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond)
-
-	// Find all outgoing edges
-	edgeBatches := make(chan []gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		defer close(edgeBatches)
-		for batch := range batches {
-			idBatch := make([]interface{}, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			batchMapReturnCount := make(map[string]int)
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					idBatch = append(idBatch, batch[i].ID)
-					batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i])
-					batchMapReturnCount[batch[i].ID] = 0
-				}
-			}
-			b := []gdbi.ElementLookup{}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.edgeIndex)
-				qParts := []elastic.Query{elastic.NewTermsQuery("from", idBatch...)}
-				if len(edgeLabels) > 0 {
-					labels := make([]interface{}, len(edgeLabels))
-					for i, v := range edgeLabels {
-						labels[i] = v
-					}
-					qParts = append(qParts, elastic.NewTermsQuery("label", labels...))
-				}
-				q = q.Query(elastic.NewBoolQuery().Must(qParts...))
-				q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Include("from", "to"))
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					edge := &gripql.Edge{}
-					err := protojson.Unmarshal(*hit.Source, edge)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal edge: %s", err)
-					}
-					r := batchMap[edge.From]
-					batchMapReturnCount[edge.From]++
-					for _, ri := range r {
-						ri.Vertex = &gdbi.Vertex{ID: edge.To}
-						b = append(b, ri)
-					}
-				}
-			}
-			if emitNull {
-				for id, count := range batchMapReturnCount {
-					if count == 0 {
-						r := batchMap[id]
-						for _, ri := range r {
-							ri.Vertex = nil
-							b = append(b, ri)
-						}
-					}
-				}
-			}
-			for i := range signals {
-				b = append(b, signals[i])
-			}
-			edgeBatches <- b
-		}
-
-		return nil
-	})
-
-	// Collect all identified vertices
-	o := make(chan gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		for batch := range edgeBatches {
-			idBatch := make([]string, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					if batch[i].Vertex != nil {
-						idBatch = append(idBatch, batch[i].Vertex.Get().ID)
-						batchMap[batch[i].Vertex.Get().ID] = append(batchMap[batch[i].Vertex.Get().ID], batch[i])
-					} else if emitNull {
-						o <- batch[i]
-					}
-				}
-			}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.vertexIndex)
-				q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...)))
-				if !load {
-					q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data"))
-				}
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					vertex := &gripql.Vertex{}
-					err := protojson.Unmarshal(*hit.Source, vertex)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal vertex: %s", err)
-					}
-					r := batchMap[vertex.Gid]
-					for _, ri := range r {
-						ri.Vertex = gdbi.NewElementFromVertex(vertex)
-						o <- ri
-					}
-				}
-			}
-			for i := range signals {
-				o <- signals[i]
-			}
-		}
-
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetOutChannel")
-		}
-	}()
-
-	return o
-}
-
-// GetInChannel gets all vertices connected to lookup elements by incoming edges
-func (es *Graph) GetInChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup {
-	g, ctx := errgroup.WithContext(ctx)
-
-	// Create query batches
-	batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond)
-
-	// Find all incoming edges
-	edgeBatches := make(chan []gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		defer close(edgeBatches)
-		for batch := range batches {
-			idBatch := make([]interface{}, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			batchMapReturnCount := make(map[string]int)
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					idBatch = append(idBatch, batch[i].ID)
-					batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i])
-					batchMapReturnCount[batch[i].ID] = 0
-				}
-			}
-			b := []gdbi.ElementLookup{}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.edgeIndex)
-				qParts := []elastic.Query{elastic.NewTermsQuery("to", idBatch...)}
-				if len(edgeLabels) > 0 {
-					labels := make([]interface{}, len(edgeLabels))
-					for i, v := range edgeLabels {
-						labels[i] = v
-					}
-					qParts = append(qParts, elastic.NewTermsQuery("label", labels...))
-				}
-				q = q.Query(elastic.NewBoolQuery().Must(qParts...))
-				q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Include("from", "to"))
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					edge := &gripql.Edge{}
-					err := protojson.Unmarshal(*hit.Source, edge)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal edge: %s", err)
-					}
-					r := batchMap[edge.To]
-					batchMapReturnCount[edge.To]++
-					for _, ri := range r {
-						ri.Vertex = &gdbi.Vertex{ID: edge.From}
-						b = append(b, ri)
-					}
-				}
-			}
-			if emitNull {
-				for id, count := range batchMapReturnCount {
-					if count == 0 {
-						r := batchMap[id]
-						for _, ri := range r {
-							ri.Vertex = nil
-							b = append(b, ri)
-						}
-					}
-				}
-			}
-			for i := range signals {
-				b = append(b, signals[i])
-			}
-			edgeBatches <- b
-		}
-
-		return nil
-	})
-
-	// Collect all identified vertices
-	o := make(chan gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		for batch := range edgeBatches {
-			idBatch := make([]string, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					if batch[i].Vertex != nil {
-						idBatch = append(idBatch, batch[i].Vertex.Get().ID)
-						batchMap[batch[i].Vertex.Get().ID] = append(batchMap[batch[i].Vertex.Get().ID], batch[i])
-					} else if emitNull {
-						o <- batch[i]
-					}
-				}
-			}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.vertexIndex)
-				q = q.Query(elastic.NewBoolQuery().Must(elastic.NewIdsQuery().Ids(idBatch...)))
-				if !load {
-					q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data"))
-				}
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					vertex := &gripql.Vertex{}
-					err := protojson.Unmarshal(*hit.Source, vertex)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal vertex: %s", err)
-					}
-					r := batchMap[vertex.Gid]
-					for _, ri := range r {
-						ri.Vertex = gdbi.NewElementFromVertex(vertex)
-						o <- ri
-					}
-				}
-				for i := range signals {
-					o <- signals[i]
-				}
-			}
-		}
-
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetInChannel")
-		}
-	}()
-
-	return o
-}
-
-// GetOutEdgeChannel gets all outgoing edges connected to lookup element
-func (es *Graph) GetOutEdgeChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup {
-	g, ctx := errgroup.WithContext(ctx)
-
-	// Create query batches
-	batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond)
-
-	// Find all outgoing edges
-	o := make(chan gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		for batch := range batches {
-			idBatch := make([]interface{}, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			batchMapReturnCount := make(map[string]int)
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					idBatch = append(idBatch, batch[i].ID)
-					batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i])
-					batchMapReturnCount[batch[i].ID] = 0
-				}
-			}
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.edgeIndex)
-				qParts := []elastic.Query{elastic.NewTermsQuery("from", idBatch...)}
-				if len(edgeLabels) > 0 {
-					labels := make([]interface{}, len(edgeLabels))
-					for i, v := range edgeLabels {
-						labels[i] = v
-					}
-					qParts = append(qParts, elastic.NewTermsQuery("label", labels...))
-				}
-				q = q.Query(elastic.NewBoolQuery().Must(qParts...))
-				if !load {
-					q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data"))
-				}
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					edge := &gripql.Edge{}
-					err := protojson.Unmarshal(*hit.Source, edge)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal edge: %s", err)
-					}
-					r := batchMap[edge.From]
-					batchMapReturnCount[edge.From]++
-					for _, ri := range r {
-						ri.Edge = gdbi.NewElementFromEdge(edge)
-						o <- ri
-					}
-				}
-			}
-			if emitNull {
-				for id, count := range batchMapReturnCount {
-					if count == 0 {
-						r := batchMap[id]
-						for _, ri := range r {
-							ri.Edge = nil
-							o <- ri
-						}
-					}
-				}
-			}
-			for i := range signals {
-				o <- signals[i]
-			}
-		}
-
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetOutEdgeChannel")
-		}
-	}()
-
-	return o
-}
-
-// GetInEdgeChannel gets incoming edges connected to lookup element
-func (es *Graph) GetInEdgeChannel(ctx context.Context, req chan gdbi.ElementLookup, load bool, emitNull bool, edgeLabels []string) chan gdbi.ElementLookup {
-	g, ctx := errgroup.WithContext(ctx)
-
-	// Create query batches
-	batches := gdbi.LookupBatcher(req, es.pageSize, time.Microsecond)
-
-	// Find all incoming edges
-	o := make(chan gdbi.ElementLookup, es.pageSize)
-	g.Go(func() error {
-		for batch := range batches {
-			idBatch := make([]interface{}, 0, len(batch))
-			batchMap := make(map[string][]gdbi.ElementLookup, len(batch))
-			batchMapReturnCount := make(map[string]int)
-			signals := []gdbi.ElementLookup{}
-			for i := range batch {
-				if batch[i].IsSignal() {
-					signals = append(signals, batch[i])
-				} else {
-					idBatch = append(idBatch, batch[i].ID)
-					batchMap[batch[i].ID] = append(batchMap[batch[i].ID], batch[i])
-					batchMapReturnCount[batch[i].ID] = 0
-				}
-			}
-
-			if len(idBatch) > 0 {
-				q := es.client.Search().Index(es.edgeIndex)
-				qParts := []elastic.Query{elastic.NewTermsQuery("to", idBatch...)}
-				if len(edgeLabels) > 0 {
-					labels := make([]interface{}, len(edgeLabels))
-					for i, v := range edgeLabels {
-						labels[i] = v
-					}
-					qParts = append(qParts, elastic.NewTermsQuery("label", labels...))
-				}
-				q = q.Query(elastic.NewBoolQuery().Must(qParts...))
-				if !load {
-					q = q.FetchSource(true).FetchSourceContext(elastic.NewFetchSourceContext(true).Exclude("data"))
-				}
-				q = q.Sort("gid", true).Size(es.pageSize)
-
-				for hit := range paginateQuery(ctx, q, es.pageSize) {
-					// Deserialize
-					edge := &gripql.Edge{}
-					err := protojson.Unmarshal(*hit.Source, edge)
-					if err != nil {
-						return fmt.Errorf("failed to unmarshal edge: %s", err)
-					}
-					r := batchMap[edge.To]
-					batchMapReturnCount[edge.To]++
-					for _, ri := range r {
-						ri.Edge = gdbi.NewElementFromEdge(edge)
-						o <- ri
-					}
-				}
-			}
-			if emitNull {
-				for id, count := range batchMapReturnCount {
-					if count == 0 {
-						r := batchMap[id]
-						for _, ri := range r {
-							ri.Edge = nil
-							o <- ri
-						}
-					}
-				}
-			}
-			for i := range signals {
-				o <- signals[i]
-			}
-		}
-
-		return nil
-	})
-
-	// Check whether any goroutines failed.
-	go func() {
-		defer close(o)
-		if err := g.Wait(); err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetInEdgeChannel")
-		}
-	}()
-
-	return o
-}
-
-// ListVertexLabels returns a list of vertex types in the graph
-func (es *Graph) ListVertexLabels() ([]string, error) {
-	q := es.client.Search().Index(es.vertexIndex).Type("vertex")
-	aggName := "vertex.labels.aggregation"
-	q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000))
-	res, err := q.Do(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	labels := []string{}
-	if agg, found := res.Aggregations.Terms(aggName); found {
-		for _, bucket := range agg.Buckets {
-			labels = append(labels, bucket.Key.(string))
-		}
-	}
-	return labels, nil
-}
-
-// ListEdgeLabels returns a list of edge types in the graph
-func (es *Graph) ListEdgeLabels() ([]string, error) {
-	q := es.client.Search().Index(es.edgeIndex).Type("edge")
-	aggName := "edge.labels.aggregation"
-	q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000))
-	res, err := q.Do(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	labels := []string{}
-	if agg, found := res.Aggregations.Terms(aggName); found {
-		for _, bucket := range agg.Buckets {
-			labels = append(labels, bucket.Key.(string))
-		}
-	}
-	return labels, nil
-}
diff --git a/elastic/graphdb.go b/elastic/graphdb.go
deleted file mode 100644
index 077582f5..00000000
--- a/elastic/graphdb.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package elastic
-
-import (
-	"context"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/bmeg/grip/gdbi"
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/bmeg/grip/timestamp"
-	elastic "gopkg.in/olivere/elastic.v5"
-)
-
-// Config describes the configuration for the elasticsearch driver.
-type Config struct {
-	URL         string
-	DBName      string
-	Username    string
-	Password    string
-	Synchronous bool
-	BatchSize   int
-}
-
-func (c *Config) SetDefaults() {
-	if c.DBName == "" {
-		c.DBName = "gripdb"
-	}
-	if c.BatchSize == 0 {
-		c.BatchSize = 1000
-	}
-}
-
-// GraphDB implements the GraphDB interface with elasticsearch as a backend
-type GraphDB struct {
-	database string
-	conf     Config
-	ts       *timestamp.Timestamp
-	client   *elastic.Client
-}
-
-// NewGraphDB creates a new elasticsearch graph database interface
-func NewGraphDB(conf Config) (gdbi.GraphDB, error) {
-	log.Info("Starting ElasticSearch Driver")
-	database := strings.ToLower(conf.DBName)
-	err := gripql.ValidateGraphName(database)
-	if err != nil {
-		return nil, fmt.Errorf("invalid database name: %v", err)
-	}
-
-	ts := timestamp.NewTimestamp()
-	opts := []elastic.ClientOptionFunc{
-		elastic.SetURL(conf.URL),
-		elastic.SetSniff(false),
-		elastic.SetRetrier(
-			elastic.NewBackoffRetrier(
-				elastic.NewExponentialBackoff(time.Millisecond*50, time.Minute),
-			),
-		),
-	}
-
-	if conf.Username != "" && conf.Password != "" {
-		opts = append(opts, elastic.SetBasicAuth(conf.Username, conf.Password))
-	}
-
-	client, err := elastic.NewClient(opts...)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create elasticsearch client: %v", err)
-	}
-	if conf.BatchSize == 0 {
-		conf.BatchSize = 1000
-	}
-	db := &GraphDB{database: database, conf: conf, ts: &ts, client: client}
-	for _, g := range db.ListGraphs() {
-		g := g
-		db.ts.Touch(g)
-		go func() {
-			err := db.setupIndices(context.Background(), g)
-			if err != nil {
-				log.WithFields(log.Fields{"error": err, "graph": g}).Error("Setting up indices")
-			}
-		}()
-	}
-	return db, nil
-}
-
-// Close closes connection to elastic search
-func (es *GraphDB) Close() error {
-	es.client.Stop()
-	return nil
-}
-
-// ListGraphs returns list of graphs on elastic search instance
-func (es *GraphDB) ListGraphs() []string {
-	graphPrefix := fmt.Sprintf("%s_", es.database)
-	out := []string{}
-	idxNames, err := es.client.IndexNames()
-	if err != nil {
-		log.WithFields(log.Fields{"error": err}).Error("ListGraphs: ElasticSearch: listing index names")
-	}
-	for _, idx := range idxNames {
-		if strings.HasPrefix(idx, graphPrefix) {
-			gName := strings.TrimPrefix(idx, graphPrefix)
-			gName = strings.TrimSuffix(gName, "_vertex")
-			gName = strings.TrimSuffix(gName, "_edge")
-			out = append(out, gName)
-		}
-	}
-	return out
-}
-
-func (es *GraphDB) createIndex(ctx context.Context, name, body string) error {
-	exists, err := es.client.
-		IndexExists(name).
-		Do(ctx)
-
-	if err != nil {
-		return err
-	} else if !exists {
-		if _, err := es.client.CreateIndex(name).Body(body).Do(ctx); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (es *GraphDB) setupIndices(ctx context.Context, graph string) error {
-	vertexIndex := fmt.Sprintf("%s_%s_vertex", es.database, graph)
-	vMapping := `{
-    "mappings": {
-      "vertex":{
-        "properties":{
-          "gid": {
-            "type": "keyword"
-          },
-          "label": {
-            "type": "keyword"
-          }
-        }
-      }
-    }
-  }`
-	if err := es.createIndex(ctx, vertexIndex, vMapping); err != nil {
-		return err
-	}
-
-	edgeIndex := fmt.Sprintf("%s_%s_edge", es.database, graph)
-	eMapping := `{
-    "mappings": {
-      "edge":{
-        "properties":{
-          "gid": {
-            "type": "keyword"
-          },
-          "from": {
-            "type": "keyword"
-          },
-          "to": {
-            "type": "keyword"
-          },
-          "label": {
-            "type": "keyword"
-          }
-        }
-      }
-    }
-  }`
-	if err := es.createIndex(ctx, edgeIndex, eMapping); err != nil {
-		return err
-	}
-	return nil
-}
-
-// AddGraph adds a new graph to the graphdb
-func (es *GraphDB) AddGraph(graph string) error {
-	err := gripql.ValidateGraphName(graph)
-	if err != nil {
-		return err
-	}
-	return es.setupIndices(context.Background(), graph)
-}
-
-// DeleteGraph deletes a graph from the graphdb
-func (es *GraphDB) DeleteGraph(graph string) error {
-	ctx := context.Background()
-
-	vertexIndex := fmt.Sprintf("%s_%s_vertex", es.database, graph)
-	if _, err := es.client.DeleteIndex(vertexIndex).Do(ctx); err != nil {
-		return err
-	}
-
-	edgeIndex := fmt.Sprintf("%s_%s_edge", es.database, graph)
-	if _, err := es.client.DeleteIndex(edgeIndex).Do(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Graph returns interface to a specific graph in the graphdb
-func (es *GraphDB) Graph(graph string) (gdbi.GraphInterface, error) {
-	found := false
-	for _, gname := range es.ListGraphs() {
-		if graph == gname {
-			found = true
-		}
-	}
-	if !found {
-		return nil, fmt.Errorf("graph '%s' was not found", graph)
-	}
-
-	return &Graph{
-		ts:          es.ts,
-		client:      es.client,
-		graph:       graph,
-		vertexIndex: fmt.Sprintf("%s_%s_vertex", es.database, graph),
-		edgeIndex:   fmt.Sprintf("%s_%s_edge", es.database, graph),
-		batchSize:   es.conf.BatchSize,
-		synchronous: es.conf.Synchronous,
-		pageSize:    500,
-	}, nil
-}
diff --git a/elastic/index.go b/elastic/index.go
deleted file mode 100644
index 74bb9737..00000000
--- a/elastic/index.go
+++ /dev/null
@@ -1,236 +0,0 @@
-package elastic
-
-import (
-	"context"
-	//"fmt"
-	"io"
-	//"strconv"
-	//"strings"
-
-	"github.com/bmeg/grip/gripql"
-	//"github.com/bmeg/grip/jsonpath"
-	"github.com/bmeg/grip/log"
-	//"github.com/bmeg/grip/protoutil"
-	elastic "gopkg.in/olivere/elastic.v5"
-)
-
-// AddVertexIndex adds a new field to be indexed
-func (es *Graph) AddVertexIndex(label string, field string) error {
-	log.WithFields(log.Fields{"label": label, "field": field}).Info("Adding vertex index")
-	return nil
-}
-
-// DeleteVertexIndex removes a vertex field index
-func (es *Graph) DeleteVertexIndex(label string, field string) error {
-	log.WithFields(log.Fields{"label": label, "field": field}).Info("Deleting vertex index")
-	return nil
-}
-
-// GetVertexIndexList gets list if vertex indices
-func (es *Graph) GetVertexIndexList() <-chan *gripql.IndexID {
-	log.Debug("Running GetVertexIndexList")
-	ctx := context.Background()
-
-	o := make(chan *gripql.IndexID)
-	go func() {
-		defer close(o)
-
-		// get all unique labels
-		q := es.client.Search().Index(es.vertexIndex).Type("vertex")
-		aggName := "labels.aggregation"
-		q = q.Aggregation(aggName, elastic.NewTermsAggregation().Field("label").Size(1000000).OrderByCountDesc())
-		res, err := q.Do(ctx)
-		if err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: label term count failed")
-			return
-		}
-
-		labels := []string{}
-		if agg, found := res.Aggregations.Terms(aggName); found {
-			for _, bucket := range agg.Buckets {
-				labels = append(labels, bucket.Key.(string))
-			}
-		}
-
-		// list indexed fields
-		mapping, err := es.client.GetMapping().Index(es.vertexIndex).Type("vertex").Do(ctx)
-		if err != nil {
-			log.WithFields(log.Fields{"error": err}).Error("GetVertexIndexList: get field mapping failed")
-			return
-		}
-
-		var data map[string]interface{}
-		if props, ok := mapping[es.vertexIndex].(map[string]interface{}); ok {
-			if props, ok = props["mappings"].(map[string]interface{}); ok {
-				if props, ok = props["vertex"].(map[string]interface{}); ok {
-					if props, ok = props["properties"].(map[string]interface{}); ok {
-						if props, ok = props["data"].(map[string]interface{}); ok {
-							if props, ok = props["properties"].(map[string]interface{}); ok {
-								data = props
-							}
-						}
-					}
-				}
-			}
-		}
-
-		for k := range data {
-			for _, l := range labels {
-				o <- &gripql.IndexID{Graph: es.graph, Label: l, Field: k}
-			}
-		}
-	}()
-
-	return o
-}
-
-/*
-// GetVertexTermAggregation returns the count of every term across vertices
-func (es *Graph) GetVertexTermAggregation(ctx context.Context, label string, field string, size uint32) (*gripql.AggregationResult, error) {
-	log.WithFields(log.Fields{"label": label, "field": field, "size": size}).Debug("Running GetVertexTermAggregation")
-	namespace := jsonpath.GetNamespace(field)
-	if namespace != jsonpath.Current {
-		return nil, fmt.Errorf("invalid field path")
-	}
-	field = jsonpath.GetJSONPath(field)
-	field = strings.TrimPrefix(field, "$.")
-
-	out := &gripql.AggregationResult{
-		Buckets: []*gripql.AggregationResultBucket{},
-	}
-
-	q := es.client.Search().Index(es.vertexIndex).Type("vertex")
-	q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label)))
-	aggName := fmt.Sprintf("term.aggregation.%s.%s", label, field)
-	if size == 0 {
-		size = 1000000
-	}
-	q = q.Aggregation(aggName,
-		elastic.NewTermsAggregation().Field(field+".keyword").Size(int(size)).OrderByCountDesc())
-	res, err := q.Do(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("term count failed: %s", err)
-	}
-	if agg, found := res.Aggregations.Terms(aggName); found {
-		for _, bucket := range agg.Buckets {
-			term := protoutil.WrapValue(bucket.Key.(string))
-			out.SortedInsert(&gripql.AggregationResultBucket{Key: term, Value: float64(bucket.DocCount)})
-			if size > 0 {
-				if len(out.Buckets) > int(size) {
-					out.Buckets = out.Buckets[:size]
-				}
-			}
-		}
-	}
-
-	return out, nil
-}
-*/
-
-/*
-//GetVertexHistogramAggregation get binned counts of a term across vertices
-func (es *Graph) GetVertexHistogramAggregation(ctx context.Context, label string, field string, interval uint32) (*gripql.AggregationResult, error) {
-	log.WithFields(log.Fields{"label": label, "field": field, "interval": interval}).Debug("Running GetVertexHistogramAggregation")
-	namespace := jsonpath.GetNamespace(field)
-	if namespace != jsonpath.Current {
-		return nil, fmt.Errorf("invalid field path")
-	}
-	field = jsonpath.GetJSONPath(field)
-	field = strings.TrimPrefix(field, "$.")
-
-	out := &gripql.AggregationResult{
-		Buckets: []*gripql.AggregationResultBucket{},
-	}
-
-	q := es.client.Search().Index(es.vertexIndex).Type("vertex")
-	q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label)))
-	aggName := fmt.Sprintf("histogram.aggregation.%s.%s", label, field)
-	q = q.Aggregation(aggName,
-		elastic.NewHistogramAggregation().Field(field).Interval(float64(interval)).OrderByKeyAsc())
-	res, err := q.Do(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("histogram aggregation failed: %s", err)
-	}
-	if agg, found := res.Aggregations.Histogram(aggName); found {
-		for _, bucket := range agg.Buckets {
-			term := protoutil.WrapValue(bucket.Key)
-			out.Buckets = append(out.Buckets, &gripql.AggregationResultBucket{Key: term, Value: float64(bucket.DocCount)})
-		}
-	}
-
-	return out, nil
-}
-*/
-
-/*
-//GetVertexPercentileAggregation get percentiles of a term across vertices
-func (es *Graph) GetVertexPercentileAggregation(ctx context.Context, label string, field string, percents []float64) (*gripql.AggregationResult, error) {
-	log.WithFields(log.Fields{"label": label, "field": field, "percents": percents}).Debug("Running GetVertexPercentileAggregation")
-	namespace := jsonpath.GetNamespace(field)
-	if namespace != jsonpath.Current {
-		return nil, fmt.Errorf("invalid field path")
-	}
-	field = jsonpath.GetJSONPath(field)
-	field = strings.TrimPrefix(field, "$.")
-
-	out := &gripql.AggregationResult{
-		Buckets: []*gripql.AggregationResultBucket{},
-	}
-
-	q := es.client.Search().Index(es.vertexIndex).Type("vertex")
-	q = q.Query(elastic.NewBoolQuery().Filter(elastic.NewTermQuery("label", label)))
-	aggName := fmt.Sprintf("percentile.aggregation.%s.%s", label, field)
-	q = q.Aggregation(aggName,
-		elastic.NewPercentilesAggregation().Field(field).Percentiles(percents...))
-	res, err := q.Do(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("percentile aggregation failed: %s", err)
-	}
-	if agg, found := res.Aggregations.Percentiles(aggName); found {
-		for key, val := range agg.Values {
-			keyf, err := strconv.ParseFloat(key, 64)
-			if err != nil {
-				return nil, fmt.Errorf("percentile key conversion failed: %s", err)
-			}
-			key := protoutil.WrapValue(keyf)
-			out.Buckets = append(out.Buckets, &gripql.AggregationResultBucket{Key: key, Value: float64(val)})
-		}
-	}
-
-	return out, nil
-}
-*/
-
-// VertexLabelScan produces a channel of all vertex ids where the vertex label matches `label`
-func (es *Graph) VertexLabelScan(ctx context.Context, label string) chan string {
-	log.WithFields(log.Fields{"label": label}).Debug("Running VertexLabelScan")
-
-	o := make(chan string, es.pageSize)
-	go func() {
-		defer close(o)
-		if label == "" {
-			return
-		}
-		scroll := es.client.Scroll().
-			Index(es.vertexIndex).
-			Query(elastic.NewBoolQuery().Must(elastic.NewTermQuery("label", label))).
-			Sort("gid", true).
-			Size(es.pageSize)
-		for {
-			results, err := scroll.Do(ctx)
-			if err == io.EOF {
-				return // all results retrieved
-			}
-			if err != nil {
-				log.WithFields(log.Fields{"error": err}).Debug("VertexLabelScan: scroll failed")
-				return
-			}
-			// Send the hits to the hits channel
-			for _, hit := range results.Hits.Hits {
-				o <- hit.Id
-			}
-		}
-	}()
-
-	return o
-}
diff --git a/elastic/schema.go b/elastic/schema.go
deleted file mode 100644
index 351edcd8..00000000
--- a/elastic/schema.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package elastic
-
-import (
-	"context"
-
-	"github.com/bmeg/grip/gdbi/schema"
-	"github.com/bmeg/grip/gripql"
-)
-
-// BuildSchema returns the schema of a specific graph in the database
-func (es *GraphDB) BuildSchema(ctx context.Context, graph string, sampleN uint32, random bool) (*gripql.Graph, error) {
-
-	gr, err := es.Graph(graph)
-	if err != nil {
-		return nil, err
-	}
-
-	return schema.SchemaScan(ctx, graph, gr, sampleN, random)
-}
diff --git a/elastic/util.go b/elastic/util.go
deleted file mode 100644
index dcd8f379..00000000
--- a/elastic/util.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package elastic
-
-import (
-	"context"
-
-	"github.com/bmeg/grip/log"
-	elastic "gopkg.in/olivere/elastic.v5"
-)
-
-func paginateQuery(ctx context.Context, q *elastic.SearchService, pageSize int) chan *elastic.SearchHit {
-	o := make(chan *elastic.SearchHit, pageSize)
-	go func() {
-		defer close(o)
-		done := false
-		count := 0
-		for {
-			if done {
-				return
-			}
-			res, err := q.From(count).Do(ctx)
-			if err != nil {
-				log.WithFields(log.Fields{"error": err}).Error("ElasticSearch: paginateQuery")
-				return
-			}
-			if res.TotalHits() > 0 {
-				for _, hit := range res.Hits.Hits {
-					count++
-					o <- hit
-				}
-			}
-			if int64(count) == res.TotalHits() {
-				done = true
-			}
-		}
-	}()
-	return o
-}
diff --git a/endpoints/graphql/builder.go b/endpoints/graphql/builder.go
deleted file mode 100644
index f32ec943..00000000
--- a/endpoints/graphql/builder.go
+++ /dev/null
@@ -1,474 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/graphql-go/graphql"
-	"github.com/graphql-go/graphql/language/ast"
-)
-
-const ARG_LIMIT = "first"
-const ARG_OFFSET = "offset"
-const ARG_ID = "id"
-const ARG_IDS = "ids"
-const ARG_FILTER = "filter"
-
-var JSONScalar = graphql.NewScalar(graphql.ScalarConfig{
-	Name: "JSON",
-	Serialize: func(value interface{}) interface{} {
-		return fmt.Sprintf("Serialize %v", value)
-	},
-	ParseValue: func(value interface{}) interface{} {
-		fmt.Printf("Unmarshal JSON: %v %T\n", value, value)
-		return value
-	},
-	ParseLiteral: func(valueAST ast.Value) interface{} {
-		fmt.Printf("ParseLiteral: %#v\n", valueAST)
-		/*
-			switch valueAST := valueAST.(type) {
-			case *ast.StringValue:
-				id, _ := models.IDFromString(valueAST.Value)
-				return id
-			default:
-				return nil
-			}*/
-		return nil
-	},
-})
-
-// buildGraphQLSchema reads a GRIP graph schema (which is stored as a graph) and creates
-// a GraphQL-GO based schema. The GraphQL-GO schema all wraps the request functions that use
-// the gripql.Client to find the requested data
-func buildGraphQLSchema(schema *gripql.Graph, client gripql.Client, graph string) (*graphql.Schema, error) {
-	if schema == nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: nil gripql.Graph for graph: %s", graph)
-	}
-	// Build the set of objects for all vertex labels
-	objectMap, err := buildObjectMap(client, graph, schema)
-	if err != nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: %v", err)
-	}
-
-	// Build the set of objects that exist in the query structuer
-	queryObj := buildQueryObject(client, graph, objectMap)
-	schemaConfig := graphql.SchemaConfig{
-		Query: queryObj,
-	}
-
-	// Setup the GraphQL schema based on the objects there have been created
-	gqlSchema, err := graphql.NewSchema(schemaConfig)
-	if err != nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: %v", err)
-	}
-
-	return &gqlSchema, nil
-}
-
-func buildField(x string) (*graphql.Field, error) {
-	var o *graphql.Field
-	switch x {
-	case "NUMERIC":
-		o = &graphql.Field{Type: graphql.Float}
-	case "STRING":
-		o = &graphql.Field{Type: graphql.String}
-	case "BOOL":
-		o = &graphql.Field{Type: graphql.Boolean}
-	default:
-		return nil, fmt.Errorf("%s does not map to a GQL type", x)
-	}
-	return o, nil
-}
-
-func buildSliceField(name string, s []interface{}) (*graphql.Field, error) {
-	var f *graphql.Field
-	var err error
-
-	if len(s) > 0 {
-		val := s[0]
-		if x, ok := val.(map[string]interface{}); ok {
-			f, err = buildObjectField(name, x)
-		} else if x, ok := val.([]interface{}); ok {
-			f, err = buildSliceField(name, x)
-
-		} else if x, ok := val.(string); ok {
-			f, err = buildField(x)
-		} else {
-			err = fmt.Errorf("unhandled type: %T %v", val, val)
-		}
-
-	} else {
-		err = fmt.Errorf("slice is empty")
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("buildSliceField error: %v", err)
-	}
-
-	return &graphql.Field{Type: graphql.NewList(f.Type)}, nil
-}
-
-// buildObjectField wraps the result of buildObject in a graphql.Field so it can be
-// a child of slice of another
-func buildObjectField(name string, obj map[string]interface{}) (*graphql.Field, error) {
-	o, err := buildObject(name, obj)
-	if err != nil {
-		return nil, err
-	}
-	if len(o.Fields()) == 0 {
-		return nil, fmt.Errorf("no fields in object")
-	}
-	return &graphql.Field{Type: o}, nil
-}
-
-func buildObject(name string, obj map[string]interface{}) (*graphql.Object, error) {
-	objFields := graphql.Fields{}
-
-	for key, val := range obj {
-		var err error
-
-		// handle map
-		if x, ok := val.(map[string]interface{}); ok {
-			// make object name parent_field
-			var f *graphql.Field
-			f, err = buildObjectField(name+"_"+key, x)
-			if err == nil {
-				objFields[key] = f
-			}
-			// handle slice
-		} else if x, ok := val.([]interface{}); ok {
-			var f *graphql.Field
-			f, err = buildSliceField(key, x)
-			if err == nil {
-				objFields[key] = f
-			}
-			// handle string
-		} else if x, ok := val.(string); ok {
-			if f, err := buildField(x); err == nil {
-				objFields[key] = f
-			} else {
-				log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildField ignoring field")
-			}
-			// handle other cases
-		} else {
-			err = fmt.Errorf("unhandled type: %T %v", val, val)
-		}
-
-		if err != nil {
-			log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildObject")
-			// return nil, fmt.Errorf("object: %s: field: %s: error: %v", name, key, err)
-		}
-	}
-
-	return graphql.NewObject(
-		graphql.ObjectConfig{
-			Name:   name,
-			Fields: objFields,
-		},
-	), nil
-}
-
-// buildObjectMap scans the GripQL schema and turns all of the vertex types into different objects
-func buildObjectMap(client gripql.Client, graph string, schema *gripql.Graph) (map[string]*graphql.Object, error) {
-	objects := map[string]*graphql.Object{}
-
-	for _, obj := range schema.Vertices {
-		if obj.Label == "Vertex" {
-			props := obj.GetDataMap()
-			if props == nil {
-				continue
-			}
-			props["id"] = "STRING"
-			gqlObj, err := buildObject(obj.Gid, props)
-			if err != nil {
-				return nil, err
-			}
-			if len(gqlObj.Fields()) > 0 {
-				objects[obj.Gid] = gqlObj
-			}
-		}
-	}
-
-	// Setup outgoing edge fields
-	// Note: edge properties are not accessible in this model
-	for i, obj := range schema.Edges {
-		if _, ok := objects[obj.From]; ok {
-			if _, ok := objects[obj.To]; ok {
-				obj := obj // This makes an inner loop copy of the variable that is used by the Resolve function
-				fname := obj.Label
-				//ensure the fname is unique
-				for j := range schema.Edges {
-					if i != j {
-						if schema.Edges[i].From == schema.Edges[j].From && schema.Edges[i].Label == schema.Edges[j].Label {
-							fname = obj.Label + "_to_" + obj.To
-						}
-					}
-				}
-
-				f := &graphql.Field{
-					Name: fname,
-					Type: graphql.NewList(objects[obj.To]),
-					Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-						srcMap, ok := p.Source.(map[string]interface{})
-						if !ok {
-							return nil, fmt.Errorf("source conversion failed: %v", p.Source)
-						}
-						srcGid, ok := srcMap["id"].(string)
-						if !ok {
-							return nil, fmt.Errorf("source gid conversion failed: %+v", srcMap)
-						}
-						q := gripql.V(srcGid).HasLabel(obj.From).Out(obj.Label).HasLabel(obj.To)
-						result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-						if err != nil {
-							return nil, err
-						}
-						out := []interface{}{}
-						for r := range result {
-							d := r.GetVertex().GetDataMap()
-							d["id"] = r.GetVertex().Gid
-							out = append(out, d)
-						}
-						return out, nil
-					},
-				}
-				fmt.Printf("building: %#v %s\n", f, obj.From)
-				objects[obj.From].AddFieldConfig(fname, f)
-			}
-		}
-	}
-
-	return objects, nil
-}
-
-func buildFieldConfigArgument(obj *graphql.Object) graphql.FieldConfigArgument {
-	args := graphql.FieldConfigArgument{
-		ARG_ID:     &graphql.ArgumentConfig{Type: graphql.String},
-		ARG_IDS:    &graphql.ArgumentConfig{Type: graphql.NewList(graphql.String)},
-		ARG_LIMIT:  &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 100},
-		ARG_OFFSET: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 0},
-		ARG_FILTER: &graphql.ArgumentConfig{Type: JSONScalar},
-	}
-	if obj == nil {
-		return args
-	}
-	for k, v := range obj.Fields() {
-		switch v.Type {
-		case graphql.String, graphql.Int, graphql.Float, graphql.Boolean:
-			args[k] = &graphql.ArgumentConfig{Type: v.Type}
-		default:
-			continue
-		}
-	}
-	return args
-}
-
-func buildAggregationField(client gripql.Client, graph string, objects map[string]*graphql.Object) *graphql.Field {
-
-	stringBucket := graphql.NewObject(graphql.ObjectConfig{
-		Name: "BucketsForString",
-		Fields: graphql.Fields{
-			"key":   &graphql.Field{Name: "key", Type: graphql.String},
-			"count": &graphql.Field{Name: "count", Type: graphql.Int},
-		},
-	})
-
-	histogram := graphql.NewObject(graphql.ObjectConfig{
-		Name: "Histogram",
-		Fields: graphql.Fields{
-			"histogram": &graphql.Field{
-				Type: graphql.NewList(stringBucket),
-			},
-		},
-	})
-
-	queryFields := graphql.Fields{}
-
-	for k, obj := range objects {
-		if len(obj.Fields()) > 0 {
-			label := obj.Name()
-
-			aggFields := graphql.Fields{
-				"_totalCount": &graphql.Field{Name: "_totalCount", Type: graphql.Int},
-			}
-			for k, v := range obj.Fields() {
-				switch v.Type {
-				case graphql.String:
-					aggFields[k] =
-						&graphql.Field{
-							Name: k,
-							Type: histogram,
-						}
-				}
-			}
-
-			ao := graphql.NewObject(graphql.ObjectConfig{
-				Name:   k + "Aggregation",
-				Fields: aggFields,
-			})
-			queryFields[k+"Aggregation"] = &graphql.Field{
-				Name: k + "Aggregation",
-				Type: ao,
-				Args: graphql.FieldConfigArgument{
-					"filter": &graphql.ArgumentConfig{Type: JSONScalar},
-				},
-				Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-					var filter *FilterBuilder
-					if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok {
-						fmt.Printf("Filter: %#v\n", filterArg)
-						filter = NewFilterBuilder(filterArg)
-					}
-					q := gripql.V().HasLabel(label)
-					if filter != nil {
-						var err error
-						q, err = filter.ExtendGrip(q)
-						if err != nil {
-							return nil, err
-						}
-					}
-
-					aggs := []*gripql.Aggregate{
-						{Name: "_totalCount", Aggregation: &gripql.Aggregate_Count{}},
-					}
-
-					counts := map[string][]any{}
-					for _, i := range p.Info.FieldASTs {
-						if i.SelectionSet != nil {
-							for _, j := range i.SelectionSet.Selections {
-								if k, ok := j.(*ast.Field); ok {
-									if k.Name.Value != "_totalCount" {
-										aggs = append(aggs, &gripql.Aggregate{
-											Name: k.Name.Value,
-											Aggregation: &gripql.Aggregate_Term{
-												Term: &gripql.TermAggregation{
-													Field: k.Name.Value,
-												},
-											},
-										})
-										counts[k.Name.Value] = []any{}
-									}
-								}
-							}
-						}
-					}
-
-					q = q.Aggregate(aggs)
-
-					result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-					if err != nil {
-						return nil, err
-					}
-					out := map[string]any{}
-
-					for i := range result {
-						agg := i.GetAggregations()
-						if agg.Name == "_totalCount" {
-							out["_totalCount"] = int(agg.Value)
-						} else {
-							counts[agg.Name] = append(counts[agg.Name], map[string]any{
-								"key":   agg.Key,
-								"count": agg.Value,
-							})
-						}
-					}
-					for k, v := range counts {
-						out[k] = map[string]any{"histogram": v}
-					}
-					return out, nil
-				},
-			}
-		}
-	}
-
-	aggregationObject := graphql.NewObject(graphql.ObjectConfig{
-		Name:   "AggregationObject",
-		Fields: queryFields,
-	})
-
-	return &graphql.Field{
-		Name: "_aggregation",
-		Type: aggregationObject,
-		Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-			// top level resolve doesn't do anything
-			// but it needs to return an empty object so that the GraphQL
-			// library will go to the child fields and call their resolvers
-			return map[string]any{}, nil
-		},
-	}
-
-}
-
-// buildQueryObject scans the built objects, which were derived from the list of vertex types
-// found in the schema. It then build a query object that will take search parameters
-// and create lists of objects of that type
-func buildQueryObject(client gripql.Client, graph string, objects map[string]*graphql.Object) *graphql.Object {
-
-	queryFields := graphql.Fields{}
-	// For each of the objects that have been listed in the objectMap build a query entry point
-	for objName, obj := range objects {
-		label := obj.Name()
-		f := &graphql.Field{
-			Name: objName,
-			Type: graphql.NewList(obj),
-			Args: buildFieldConfigArgument(obj),
-			Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-				q := gripql.V().HasLabel(label)
-				if id, ok := p.Args[ARG_ID].(string); ok {
-					//fmt.Printf("Doing %s id=%s query", label, id)
-					q = gripql.V(id).HasLabel(label)
-				}
-				if ids, ok := p.Args[ARG_IDS].([]string); ok {
-					q = gripql.V(ids...).HasLabel(label)
-				}
-				var filter *FilterBuilder
-				if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok {
-					fmt.Printf("Filter: %#v\n", filterArg)
-					filter = NewFilterBuilder(filterArg)
-				}
-				for key, val := range p.Args {
-					switch key {
-					case ARG_ID, ARG_IDS, ARG_LIMIT, ARG_OFFSET, ARG_FILTER:
-					default:
-						q = q.Has(gripql.Eq(key, val))
-					}
-				}
-				//if filter was passed, apply it
-				if filter != nil {
-					var err error
-					q, err = filter.ExtendGrip(q)
-					if err != nil {
-						return nil, err
-					}
-				}
-				limit := p.Args[ARG_LIMIT].(int)
-				offset := p.Args[ARG_OFFSET].(int)
-				q = q.Skip(uint32(offset)).Limit(uint32(limit))
-				result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-				if err != nil {
-					return nil, err
-				}
-				out := []interface{}{}
-				for r := range result {
-					//fmt.Printf("ID query traversal: %s\n", r)
-					d := r.GetVertex().GetDataMap()
-					d["id"] = r.GetVertex().Gid
-					out = append(out, d)
-				}
-				return out, nil
-			},
-		}
-
-		queryFields[objName] = f
-	}
-
-	queryFields["_aggregation"] = buildAggregationField(client, graph, objects)
-
-	query := graphql.NewObject(
-		graphql.ObjectConfig{
-			Name:   "Query",
-			Fields: queryFields,
-		},
-	)
-	fmt.Printf("Query fields: %#v\n", queryFields)
-	return query
-}
diff --git a/endpoints/graphql/filter_build.go b/endpoints/graphql/filter_build.go
deleted file mode 100644
index 3d19c43d..00000000
--- a/endpoints/graphql/filter_build.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package main
-
-import (
-	"github.com/bmeg/grip/log"
-
-	"github.com/bmeg/grip/gripql"
-)
-
-type FilterBuilder struct {
-	filter map[string]any
-}
-
-func NewFilterBuilder(i map[string]any) *FilterBuilder {
-	return &FilterBuilder{i}
-}
-
-func isFilterEQ(q map[string]any) (any, bool) {
-	for _, i := range []string{"=", "eq", "EQ"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func isFilterGT(q map[string]any) (any, bool) {
-	for _, i := range []string{">", "gt", "GT"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func isFilterLT(q map[string]any) (any, bool) {
-	for _, i := range []string{"<", "lt", "LT"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func fieldMap(s string) string {
-	if s == "id" {
-		return "_gid"
-	}
-	return s
-}
-
-func (fb *FilterBuilder) ExtendGrip(q *gripql.Query) (*gripql.Query, error) {
-	if val, ok := isFilterEQ(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Eq(k, v))
-			}
-		}
-	}
-	if val, ok := isFilterGT(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Gt(k, v))
-			}
-		}
-	}
-	if val, ok := isFilterLT(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Lt(k, v))
-			}
-		}
-	}
-	log.Infof("Filter Query %s", q.String())
-	return q, nil
-}
diff --git a/endpoints/graphql/handler.go b/endpoints/graphql/handler.go
deleted file mode 100644
index db19dd4a..00000000
--- a/endpoints/graphql/handler.go
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-GraphQL Web endpoint
-*/
-
-package main
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/graphql-go/handler"
-)
-
-// handle the graphql queries for a single endpoint
-type graphHandler struct {
-	graph      string
-	gqlHandler *handler.Handler
-	timestamp  string
-	client     gripql.Client
-	//schema     *gripql.Graph
-}
-
-// Handler is a GraphQL endpoint to query the Grip database
-type Handler struct {
-	handlers map[string]*graphHandler
-	client   gripql.Client
-}
-
-// NewClientHTTPHandler initilizes a new GraphQLHandler
-func NewHTTPHandler(client gripql.Client, config map[string]string) (http.Handler, error) {
-	h := &Handler{
-		client:   client,
-		handlers: map[string]*graphHandler{},
-	}
-	return h, nil
-}
-
-// Static HTML that links to Apollo GraphQL query editor
-var sandBox = `
-<div id="sandbox" style="position:absolute;top:0;right:0;bottom:0;left:0"></div>
-<script src="https://embeddable-sandbox.cdn.apollographql.com/_latest/embeddable-sandbox.umd.production.min.js"></script>
-<script>
- new window.EmbeddedSandbox({
-   target: "#sandbox",
-   // Pass through your server href if you are embedding on an endpoint.
-   // Otherwise, you can pass whatever endpoint you want Sandbox to start up with here.
-   initialEndpoint: window.location.href,
- });
- // advanced options: https://www.apollographql.com/docs/studio/explorer/sandbox#embedding-sandbox
-</script>`
-
-// ServeHTTP responds to HTTP graphql requests
-func (gh *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
-	//log.Infof("Request for %s", request.URL.Path)
-	//If no graph provided, return the Query Editor page
-	if request.URL.Path == "" || request.URL.Path == "/" {
-		writer.Write([]byte(sandBox))
-		return
-	}
-	//pathRE := regexp.MustCompile("/(.+)$")
-	//graphName := pathRE.FindStringSubmatch(request.URL.Path)[1]
-	graphName := request.URL.Path
-	var handler *graphHandler
-	var ok bool
-	if handler, ok = gh.handlers[graphName]; ok {
-		//Call the setup function. If nothing has changed it will return without doing anything
-		err := handler.setup()
-		if err != nil {
-			http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-			return
-		}
-	} else {
-		//Graph handler was not found, so we'll need to set it up
-		var err error
-		handler, err = newGraphHandler(graphName, gh.client)
-		if err != nil {
-			http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-			return
-		}
-		gh.handlers[graphName] = handler
-	}
-	if handler != nil && handler.gqlHandler != nil {
-		handler.gqlHandler.ServeHTTP(writer, request)
-	} else {
-		http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-	}
-}
-
-// newGraphHandler creates a new graphql handler from schema
-func newGraphHandler(graph string, client gripql.Client) (*graphHandler, error) {
-	o := &graphHandler{
-		graph:  graph,
-		client: client,
-	}
-	err := o.setup()
-	if err != nil {
-		return nil, err
-	}
-	return o, nil
-}
-
-// check timestamp to see if schema needs to be updated, and if so
-// rebuild graphql schema
-func (gh *graphHandler) setup() error {
-	ts, _ := gh.client.GetTimestamp(gh.graph)
-	if ts == nil || ts.Timestamp != gh.timestamp {
-		log.WithFields(log.Fields{"graph": gh.graph}).Info("Reloading GraphQL schema")
-		schema, err := gh.client.GetSchema(gh.graph)
-		if err != nil {
-			log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GetSchema error")
-			return err
-		}
-		gqlSchema, err := buildGraphQLSchema(schema, gh.client, gh.graph)
-		if err != nil {
-			log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GraphQL schema build failed")
-			gh.gqlHandler = nil
-			gh.timestamp = ""
-		} else {
-			log.WithFields(log.Fields{"graph": gh.graph}).Info("Built GraphQL schema")
-			gh.gqlHandler = handler.New(&handler.Config{
-				Schema: gqlSchema,
-			})
-			gh.timestamp = ts.Timestamp
-		}
-	}
-	return nil
-}
diff --git a/endpoints/graphql/test/graphql_query_test.go b/endpoints/graphql/test/graphql_query_test.go
deleted file mode 100644
index 7cc9f380..00000000
--- a/endpoints/graphql/test/graphql_query_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package test
-
-import (
-	"fmt"
-	//"io/ioutil"
-	//"net/http"
-	//"bytes"
-	"context"
-	"testing"
-
-	//"encoding/json"
-
-	"github.com/bmeg/jsonpath"
-	"github.com/machinebox/graphql"
-)
-
-var tests = [][]string{
-	{
-		`
-      query {
-        Character(id:"1"){
-          id
-          name
-          starships_to_Starship {
-            name
-          }
-        }
-      }
-    `,
-		`{}`,
-	},
-}
-
-func TestQuerySet(t *testing.T) {
-	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
-	client := graphql.NewClient(url)
-
-	for _, pair := range tests {
-		req := graphql.NewRequest(pair[0])
-
-		ctx := context.Background()
-		respData := map[string]interface{}{}
-		if err := client.Run(ctx, req, &respData); err != nil {
-			t.Error(err)
-		}
-		//out, err := json.Marshal(respData)
-		//if err != nil {
-		//  t.Error(err)
-		//}
-		//fmt.Printf("out: %s\n", out)
-	}
-}
-
-func TestCharacterQuery(t *testing.T) {
-	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
-	client := graphql.NewClient(url)
-
-	// make a request
-	req := graphql.NewRequest(`
-    query {
-      Character(id:"Character:1"){
-        id
-        name
-        starships_to_Starship {
-          name
-        }
-      }
-    }
-  `)
-
-	ctx := context.Background()
-	respData := map[string]interface{}{}
-	if err := client.Run(ctx, req, &respData); err != nil {
-		t.Error(err)
-	}
-
-	out, err := jsonpath.JsonPathLookup(respData, "$.Character[0].id")
-	if err != nil {
-		t.Error(err)
-	}
-	if idStr, ok := out.(string); ok {
-		if idStr != "Character:1" {
-			t.Errorf("id mismatch: %s != %s", "Character:1", idStr)
-		}
-	} else {
-		t.Errorf("ID not string")
-	}
-}
-
-func TestIntrospectionQuery(t *testing.T) {
-	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
-	client := graphql.NewClient(url)
-
-	// make a request
-	req := graphql.NewRequest(`{
-     __type(name:"Character") {
-        fields {
-           name
-           description
-        }
-     }
-  }`)
-
-	ctx := context.Background()
-	respData := map[string]interface{}{}
-	if err := client.Run(ctx, req, &respData); err != nil {
-		t.Error(err)
-	}
-	//fmt.Printf("Response: %#v\n", respData)
-}
diff --git a/endpoints/graphql/test/main_test.go b/endpoints/graphql/test/main_test.go
deleted file mode 100644
index 6a8d0220..00000000
--- a/endpoints/graphql/test/main_test.go
+++ /dev/null
@@ -1,201 +0,0 @@
-package test
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/bmeg/grip/config"
-	"github.com/bmeg/grip/elastic"
-	"github.com/bmeg/grip/endpoints/graphql"
-	"github.com/bmeg/grip/gdbi"
-	"github.com/bmeg/grip/grids"
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/gripql/schema"
-	"github.com/bmeg/grip/kvgraph"
-	_ "github.com/bmeg/grip/kvi/badgerdb" // import so badger will register itself
-	_ "github.com/bmeg/grip/kvi/boltdb"   // import so bolt will register itself
-	_ "github.com/bmeg/grip/kvi/leveldb"  // import so level will register itself
-	"github.com/bmeg/grip/mongo"
-	"github.com/bmeg/grip/psql"
-	"github.com/bmeg/grip/server"
-	"github.com/bmeg/grip/util"
-	_ "github.com/lib/pq" // import so postgres will register as a sql driver
-	//"google.golang.org/protobuf/encoding/protojson"
-)
-
-var configFile string
-var gdb gdbi.GraphDB
-var db gdbi.GraphInterface
-var dbname string
-var vertices = []*gripql.Vertex{}
-var edges = []*gripql.Edge{}
-
-var GraphQLAddr = "localhost:9080"
-var GraphName = "test-graph"
-
-func setupGraph() error {
-	// sort edges/vertices and insert one at a time to ensure the same write order
-	sort.Slice(vertices[:], func(i, j int) bool {
-		return vertices[i].Gid < vertices[j].Gid
-	})
-	for _, v := range vertices {
-		err := db.AddVertex([]*gdbi.Vertex{gdbi.NewElementFromVertex(v)})
-		if err != nil {
-			return err
-		}
-	}
-
-	sort.Slice(edges[:], func(i, j int) bool {
-		return edges[i].Gid < edges[j].Gid
-	})
-	for _, e := range edges {
-		err := db.AddEdge([]*gdbi.Edge{gdbi.NewElementFromEdge(e)})
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func TestMain(m *testing.M) {
-	flag.StringVar(&configFile, "config", configFile, "config file to use for tests")
-	flag.Parse()
-
-	configFile = "../" + configFile
-
-	vertChan, err := util.StreamVerticesFromFile("../../conformance/graphs/swapi.vertices", 2)
-	if err != nil {
-		panic(err)
-	}
-	for v := range vertChan {
-		vertices = append(vertices, v)
-	}
-	edgeChan, err := util.StreamEdgesFromFile("../../conformance/graphs/swapi.edges", 2)
-	if err != nil {
-		panic(err)
-	}
-	for e := range edgeChan {
-		edges = append(edges, e)
-	}
-
-	var exit = 1
-
-	defer func() {
-		fmt.Println("tests exiting with code", exit)
-		os.Exit(exit)
-	}()
-
-	conf := config.DefaultConfig()
-	if configFile != "" {
-		err := config.ParseConfigFile(configFile, conf)
-		if err != nil {
-			fmt.Printf("error processing config file: %v", err)
-			return
-		}
-	}
-
-	config.TestifyConfig(conf)
-	fmt.Printf("Test config: %+v\n", conf)
-	dbconfig := conf.Drivers[conf.Default]
-
-	if dbconfig.Badger != nil {
-		gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Badger)
-		defer func() {
-			os.RemoveAll(*dbconfig.Badger)
-		}()
-	} else if dbconfig.Bolt != nil {
-		gdb, err = kvgraph.NewKVGraphDB("bolt", *dbconfig.Bolt)
-		defer func() {
-			os.RemoveAll(*dbconfig.Bolt)
-		}()
-	} else if dbconfig.Level != nil {
-		gdb, err = kvgraph.NewKVGraphDB("badger", *dbconfig.Level)
-		defer func() {
-			os.RemoveAll(*dbconfig.Level)
-		}()
-	} else if dbconfig.Grids != nil {
-		gdb, err = grids.NewGraphDB(*dbconfig.Grids)
-		defer func() {
-			os.RemoveAll(*dbconfig.Grids)
-		}()
-	} else if dbconfig.Elasticsearch != nil {
-		gdb, err = elastic.NewGraphDB(*dbconfig.Elasticsearch)
-	} else if dbconfig.MongoDB != nil {
-		gdb, err = mongo.NewGraphDB(*dbconfig.MongoDB)
-	} else if dbconfig.PSQL != nil {
-		gdb, err = psql.NewGraphDB(*dbconfig.PSQL)
-	} else {
-		err = fmt.Errorf("unknown database")
-	}
-
-	err = gdb.AddGraph(GraphName)
-	if err != nil {
-		fmt.Println("Error: failed to add graph:", err)
-		return
-	}
-
-	db, err = gdb.Graph(GraphName)
-	if err != nil {
-		fmt.Println("Error: failed to connect to graph:", err)
-		return
-	}
-
-	if dbname != "existing-sql" {
-		err = setupGraph()
-		if err != nil {
-			fmt.Println("Error: setting up graph:", err)
-			return
-		}
-	}
-
-	srv, err := server.NewGripServer(conf, "./", map[string]gdbi.GraphDB{conf.Default: gdb})
-	if err != nil {
-		fmt.Println("Error: failed to init server", err)
-		return
-	}
-
-	conn := gripql.WrapClient(gripql.NewQueryDirectClient(srv), gripql.NewEditDirectClient(srv), nil, nil)
-
-	sch, err := schema.ScanSchema(conn, GraphName, 10, []string{})
-	if err != nil {
-		fmt.Println("Error: failed to init server", err)
-		return
-	}
-
-	//fmt.Printf("Adding Schema: %s\n", protojson.Format(sch))
-	err = conn.AddSchema(sch)
-	if err != nil {
-		fmt.Printf("Error: failed to add schema %s\n", err)
-		return
-	}
-	gqlHandler, err := graphql.NewClientHTTPHandler(conn)
-
-	httpServer := http.Server{Addr: GraphQLAddr, Handler: gqlHandler}
-
-	go func() {
-		if err := httpServer.ListenAndServe(); err != http.ErrServerClosed {
-			// Error starting or closing listener:
-			log.Fatalf("HTTP server ListenAndServe: %v", err)
-		}
-	}()
-
-	defer os.RemoveAll(conf.Server.WorkDir)
-	time.Sleep(time.Second)
-
-	// run tests
-	exit = m.Run()
-
-	if err := httpServer.Shutdown(context.Background()); err != nil {
-		// Error from closing listeners, or context timeout:
-		log.Printf("HTTP server Shutdown: %v", err)
-	}
-
-}
diff --git a/endpoints/graphqlv2/builder.go b/endpoints/graphqlv2/builder.go
deleted file mode 100644
index b18b79a4..00000000
--- a/endpoints/graphqlv2/builder.go
+++ /dev/null
@@ -1,563 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/graphql-go/graphql"
-	"github.com/graphql-go/graphql/language/ast"
-)
-
-const ARG_LIMIT = "first"
-const ARG_OFFSET = "offset"
-const ARG_ID = "id"
-const ARG_IDS = "ids"
-const ARG_FILTER = "filter"
-
-var JSONScalar = graphql.NewScalar(graphql.ScalarConfig{
-	Name: "JSON",
-	Serialize: func(value interface{}) interface{} {
-		return fmt.Sprintf("Serialize %v", value)
-	},
-	ParseValue: func(value interface{}) interface{} {
-		fmt.Printf("Unmarshal JSON: %v %T\n", value, value)
-		return value
-	},
-	ParseLiteral: func(valueAST ast.Value) interface{} {
-		fmt.Printf("ParseLiteral: %#v\n", valueAST)
-		/*
-			switch valueAST := valueAST.(type) {
-			case *ast.StringValue:
-				id, _ := models.IDFromString(valueAST.Value)
-				return id
-			default:
-				return nil
-			}*/
-		return nil
-	},
-})
-
-// buildGraphQLSchema reads a GRIP graph schema (which is stored as a graph) and creates
-// a GraphQL-GO based schema. The GraphQL-GO schema all wraps the request functions that use
-// the gripql.Client to find the requested data
-func buildGraphQLSchema(schema *gripql.Graph, client gripql.Client, graph string) (*graphql.Schema, error) {
-	if schema == nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: nil gripql.Graph for graph: %s", graph)
-	}
-	// Build the set of objects for all vertex labels
-	objectMap, err := buildObjectMap(client, graph, schema)
-	if err != nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: %v", err)
-	}
-
-	// Build the set of objects that exist in the query structuer
-	queryObj := buildQueryObject(client, graph, objectMap)
-	schemaConfig := graphql.SchemaConfig{
-		Query: queryObj,
-	}
-
-	// Setup the GraphQL schema based on the objects there have been created
-	gqlSchema, err := graphql.NewSchema(schemaConfig)
-	if err != nil {
-		return nil, fmt.Errorf("graphql.NewSchema error: %v", err)
-	}
-
-	return &gqlSchema, nil
-}
-
-func buildField(x string) (*graphql.Field, error) {
-	var o *graphql.Field
-	switch x {
-	case "NUMERIC":
-		o = &graphql.Field{Type: graphql.Float}
-	case "STRING":
-		o = &graphql.Field{Type: graphql.String}
-	case "BOOL":
-		o = &graphql.Field{Type: graphql.Boolean}
-	default:
-		return nil, fmt.Errorf("%s does not map to a GQL type", x)
-	}
-	return o, nil
-}
-
-func buildSliceField(name string, s []interface{}) (*graphql.Field, error) {
-	var f *graphql.Field
-	var err error
-
-	if len(s) > 0 {
-		val := s[0]
-		if x, ok := val.(map[string]interface{}); ok {
-			f, err = buildObjectField(name, x)
-		} else if x, ok := val.([]interface{}); ok {
-			f, err = buildSliceField(name, x)
-
-		} else if x, ok := val.(string); ok {
-			f, err = buildField(x)
-		} else {
-			err = fmt.Errorf("unhandled type: %T %v", val, val)
-		}
-
-	} else {
-		err = fmt.Errorf("slice is empty")
-	}
-
-	if err != nil {
-		return nil, fmt.Errorf("buildSliceField error: %v", err)
-	}
-
-	return &graphql.Field{Type: graphql.NewList(f.Type)}, nil
-}
-
-// buildObjectField wraps the result of buildObject in a graphql.Field so it can be
-// a child of slice of another
-func buildObjectField(name string, obj map[string]interface{}) (*graphql.Field, error) {
-	o, err := buildObject(name, obj)
-	if err != nil {
-		return nil, err
-	}
-	if len(o.Fields()) == 0 {
-		return nil, fmt.Errorf("no fields in object")
-	}
-	return &graphql.Field{Type: o}, nil
-}
-
-func buildObject(name string, obj map[string]interface{}) (*graphql.Object, error) {
-	objFields := graphql.Fields{}
-
-	for key, val := range obj {
-		var err error
-
-		// handle map
-		if x, ok := val.(map[string]interface{}); ok {
-			// make object name parent_field
-			var f *graphql.Field
-			f, err = buildObjectField(name+"_"+key, x)
-			if err == nil {
-				objFields[key] = f
-			}
-			// handle slice
-		} else if x, ok := val.([]interface{}); ok {
-			var f *graphql.Field
-			f, err = buildSliceField(key, x)
-			if err == nil {
-				objFields[key] = f
-			}
-			// handle string
-		} else if x, ok := val.(string); ok {
-			if f, err := buildField(x); err == nil {
-				objFields[key] = f
-			} else {
-				log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildField ignoring field")
-			}
-			// handle other cases
-		} else {
-			err = fmt.Errorf("unhandled type: %T %v", val, val)
-		}
-
-		if err != nil {
-			log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildObject")
-			// return nil, fmt.Errorf("object: %s: field: %s: error: %v", name, key, err)
-		}
-	}
-
-	return graphql.NewObject(
-		graphql.ObjectConfig{
-			Name:   name,
-			Fields: objFields,
-		},
-	), nil
-}
-
-type objectMap struct {
-	objects     map[string]*graphql.Object
-	edgeLabel   map[string]map[string]string
-	edgeDstType map[string]map[string]string
-}
-
-// buildObjectMap scans the GripQL schema and turns all of the vertex types into different objects
-func buildObjectMap(client gripql.Client, graph string, schema *gripql.Graph) (*objectMap, error) {
-	objects := map[string]*graphql.Object{}
-	edgeLabel := map[string]map[string]string{}
-	edgeDstType := map[string]map[string]string{}
-
-	for _, obj := range schema.Vertices {
-		if obj.Label == "Vertex" {
-			props := obj.GetDataMap()
-			if props == nil {
-				continue
-			}
-			props["id"] = "STRING"
-			gqlObj, err := buildObject(obj.Gid, props)
-			if err != nil {
-				return nil, err
-			}
-			if len(gqlObj.Fields()) > 0 {
-				objects[obj.Gid] = gqlObj
-			}
-		}
-		edgeLabel[obj.Gid] = map[string]string{}
-		edgeDstType[obj.Gid] = map[string]string{}
-	}
-
-	// Setup outgoing edge fields
-	// Note: edge properties are not accessible in this model
-	for i, obj := range schema.Edges {
-		if _, ok := objects[obj.From]; ok {
-			if _, ok := objects[obj.To]; ok {
-				obj := obj // This makes an inner loop copy of the variable that is used by the Resolve function
-				fname := obj.Label
-
-				//ensure the fname is unique
-				for j := range schema.Edges {
-					if i != j {
-						if schema.Edges[i].From == schema.Edges[j].From && schema.Edges[i].Label == schema.Edges[j].Label {
-							fname = obj.Label + "_to_" + obj.To
-						}
-					}
-				}
-				edgeLabel[obj.From][fname] = obj.Label
-				edgeDstType[obj.From][fname] = obj.To
-
-				f := &graphql.Field{
-					Name: fname,
-					Type: graphql.NewList(objects[obj.To]),
-					/*
-						Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-							srcMap, ok := p.Source.(map[string]interface{})
-							if !ok {
-								return nil, fmt.Errorf("source conversion failed: %v", p.Source)
-							}
-							srcGid, ok := srcMap["id"].(string)
-							if !ok {
-								return nil, fmt.Errorf("source gid conversion failed: %+v", srcMap)
-							}
-							fmt.Printf("Field resolve: %s\n", srcGid)
-							q := gripql.V(srcGid).HasLabel(obj.From).Out(obj.Label).HasLabel(obj.To)
-							result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-							if err != nil {
-								return nil, err
-							}
-							out := []interface{}{}
-							for r := range result {
-								d := r.GetVertex().GetDataMap()
-								d["id"] = r.GetVertex().Gid
-								out = append(out, d)
-							}
-							return out, nil
-						},
-					*/
-				}
-				fmt.Printf("building: %#v %s\n", f, obj.From)
-				objects[obj.From].AddFieldConfig(fname, f)
-			}
-		}
-	}
-
-	return &objectMap{objects: objects, edgeLabel: edgeLabel, edgeDstType: edgeDstType}, nil
-}
-
-func buildFieldConfigArgument(obj *graphql.Object) graphql.FieldConfigArgument {
-	args := graphql.FieldConfigArgument{
-		ARG_ID:     &graphql.ArgumentConfig{Type: graphql.String},
-		ARG_IDS:    &graphql.ArgumentConfig{Type: graphql.NewList(graphql.String)},
-		ARG_LIMIT:  &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 100},
-		ARG_OFFSET: &graphql.ArgumentConfig{Type: graphql.Int, DefaultValue: 0},
-		ARG_FILTER: &graphql.ArgumentConfig{Type: JSONScalar},
-	}
-	if obj == nil {
-		return args
-	}
-	for k, v := range obj.Fields() {
-		switch v.Type {
-		case graphql.String, graphql.Int, graphql.Float, graphql.Boolean:
-			args[k] = &graphql.ArgumentConfig{Type: v.Type}
-		default:
-			continue
-		}
-	}
-	return args
-}
-
-func buildAggregationField(client gripql.Client, graph string, objects *objectMap) *graphql.Field {
-
-	stringBucket := graphql.NewObject(graphql.ObjectConfig{
-		Name: "BucketsForString",
-		Fields: graphql.Fields{
-			"key":   &graphql.Field{Name: "key", Type: graphql.String},
-			"count": &graphql.Field{Name: "count", Type: graphql.Int},
-		},
-	})
-
-	histogram := graphql.NewObject(graphql.ObjectConfig{
-		Name: "Histogram",
-		Fields: graphql.Fields{
-			"histogram": &graphql.Field{
-				Type: graphql.NewList(stringBucket),
-			},
-		},
-	})
-
-	queryFields := graphql.Fields{}
-
-	for k, obj := range objects.objects {
-		if len(obj.Fields()) > 0 {
-			label := obj.Name()
-
-			aggFields := graphql.Fields{
-				"_totalCount": &graphql.Field{Name: "_totalCount", Type: graphql.Int},
-			}
-			for k, v := range obj.Fields() {
-				switch v.Type {
-				case graphql.String:
-					aggFields[k] =
-						&graphql.Field{
-							Name: k,
-							Type: histogram,
-						}
-				}
-			}
-
-			ao := graphql.NewObject(graphql.ObjectConfig{
-				Name:   k + "Aggregation",
-				Fields: aggFields,
-			})
-			queryFields[k+"Aggregation"] = &graphql.Field{
-				Name: k + "Aggregation",
-				Type: ao,
-				Args: graphql.FieldConfigArgument{
-					"filter": &graphql.ArgumentConfig{Type: JSONScalar},
-				},
-				Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-					var filter *FilterBuilder
-					if filterArg, ok := p.Args[ARG_FILTER].(map[string]any); ok {
-						fmt.Printf("Filter: %#v\n", filterArg)
-						filter = NewFilterBuilder(filterArg)
-					}
-					q := gripql.V().HasLabel(label)
-					if filter != nil {
-						var err error
-						q, err = filter.ExtendGrip(q)
-						if err != nil {
-							return nil, err
-						}
-					}
-
-					aggs := []*gripql.Aggregate{
-						{Name: "_totalCount", Aggregation: &gripql.Aggregate_Count{}},
-					}
-
-					counts := map[string][]any{}
-					for _, i := range p.Info.FieldASTs {
-						if i.SelectionSet != nil {
-							for _, j := range i.SelectionSet.Selections {
-								if k, ok := j.(*ast.Field); ok {
-									if k.Name.Value != "_totalCount" {
-										aggs = append(aggs, &gripql.Aggregate{
-											Name: k.Name.Value,
-											Aggregation: &gripql.Aggregate_Term{
-												Term: &gripql.TermAggregation{
-													Field: k.Name.Value,
-												},
-											},
-										})
-										counts[k.Name.Value] = []any{}
-									}
-								}
-							}
-						}
-					}
-
-					q = q.Aggregate(aggs)
-
-					result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-					if err != nil {
-						return nil, err
-					}
-					out := map[string]any{}
-
-					for i := range result {
-						agg := i.GetAggregations()
-						if agg.Name == "_totalCount" {
-							out["_totalCount"] = int(agg.Value)
-						} else {
-							counts[agg.Name] = append(counts[agg.Name], map[string]any{
-								"key":   agg.Key,
-								"count": agg.Value,
-							})
-						}
-					}
-					for k, v := range counts {
-						out[k] = map[string]any{"histogram": v}
-					}
-					return out, nil
-				},
-			}
-		}
-	}
-
-	aggregationObject := graphql.NewObject(graphql.ObjectConfig{
-		Name:   "AggregationObject",
-		Fields: queryFields,
-	})
-
-	return &graphql.Field{
-		Name: "_aggregation",
-		Type: aggregationObject,
-		Resolve: func(p graphql.ResolveParams) (interface{}, error) {
-			// top level resolve doesn't do anything
-			// but it needs to return an empty object so that the GraphQL
-			// library will go to the child fields and call their resolvers
-			return map[string]any{}, nil
-		},
-	}
-}
-
-type renderTree struct {
-	fields    []string
-	parent    map[string]string
-	fieldName map[string]string
-}
-
-func (rt *renderTree) NewElement(cur string, fieldName string) string {
-	rName := fmt.Sprintf("f%d", len(rt.fields))
-	rt.fields = append(rt.fields, rName)
-	rt.parent[rName] = cur
-	rt.fieldName[rName] = fieldName
-	return rName
-}
-
-func (om *objectMap) traversalBuild(query *gripql.Query, vertLabel string, field *ast.Field, curElement string, rt *renderTree) *gripql.Query {
-	//fmt.Printf("VertLabel: %s\n", vertLabel)
-	moved := false
-	for _, s := range field.SelectionSet.Selections {
-		if k, ok := s.(*ast.Field); ok {
-			if edgeLabel, ok := om.edgeLabel[vertLabel][k.Name.Value]; ok {
-				if dstLabel, ok := om.edgeDstType[vertLabel][k.Name.Value]; ok {
-					if moved {
-						query = query.Select(curElement)
-					}
-					rName := rt.NewElement(curElement, k.Name.Value)
-					query = query.OutNull(edgeLabel).As(rName)
-					query = om.traversalBuild(query, dstLabel, k, rName, rt)
-					moved = true
-				}
-			}
-		}
-	}
-	return query
-}
-
-// buildQueryObject scans the built objects, which were derived from the list of vertex types
-// found in the schema. It then build a query object that will take search parameters
-// and create lists of objects of that type
-func buildQueryObject(client gripql.Client, graph string, objects *objectMap) *graphql.Object {
-
-	queryFields := graphql.Fields{}
-	// For each of the objects that have been listed in the objectMap build a query entry point
-	for objName, obj := range objects.objects {
-		label := obj.Name()
-		f := &graphql.Field{
-			Name: objName,
-			Type: graphql.NewList(obj),
-			Args: buildFieldConfigArgument(obj),
-			Resolve: func(params graphql.ResolveParams) (interface{}, error) {
-
-				q := gripql.V().HasLabel(label)
-				if id, ok := params.Args[ARG_ID].(string); ok {
-					//fmt.Printf("Doing %s id=%s query", label, id)
-					q = gripql.V(id).HasLabel(label)
-				}
-				if ids, ok := params.Args[ARG_IDS].([]string); ok {
-					q = gripql.V(ids...).HasLabel(label)
-				}
-				var filter *FilterBuilder
-				if filterArg, ok := params.Args[ARG_FILTER].(map[string]any); ok {
-					fmt.Printf("Filter: %#v\n", filterArg)
-					filter = NewFilterBuilder(filterArg)
-				}
-				for key, val := range params.Args {
-					switch key {
-					case ARG_ID, ARG_IDS, ARG_LIMIT, ARG_OFFSET, ARG_FILTER:
-					default:
-						q = q.Has(gripql.Eq(key, val))
-					}
-				}
-				//if filter was passed, apply it
-				if filter != nil {
-					var err error
-					q, err = filter.ExtendGrip(q)
-					if err != nil {
-						return nil, err
-					}
-				}
-
-				q = q.As("f0")
-				limit := params.Args[ARG_LIMIT].(int)
-				offset := params.Args[ARG_OFFSET].(int)
-				q = q.Skip(uint32(offset)).Limit(uint32(limit))
-
-				rt := &renderTree{
-					fields:    []string{"f0"},
-					parent:    map[string]string{},
-					fieldName: map[string]string{},
-				}
-				for _, f := range params.Info.FieldASTs {
-					q = objects.traversalBuild(q, label, f, "f0", rt)
-				}
-
-				render := map[string]any{}
-				for _, i := range rt.fields {
-					render[i+"_gid"] = "$" + i + "._gid"
-					render[i+"_data"] = "$" + i + "._data"
-				}
-				q = q.Render(render)
-				fmt.Printf("query: %s\n", q.String())
-				result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
-				if err != nil {
-					return nil, err
-				}
-				out := []interface{}{}
-				for r := range result {
-					values := r.GetRender().GetStructValue().AsMap()
-					//fmt.Printf("render: %#v\n", values)
-					data := map[string]map[string]any{}
-					for _, r := range rt.fields {
-						v := values[r+"_data"]
-						if d, ok := v.(map[string]any); ok {
-							d["id"] = values[r+"_gid"]
-							if d["id"] != "" {
-								data[r] = d
-							}
-						}
-					}
-					for _, r := range rt.fields {
-						if parent, ok := rt.parent[r]; ok {
-							fieldName := rt.fieldName[r]
-							if data[r] != nil {
-								data[parent][fieldName] = []any{data[r]}
-							}
-						}
-					}
-					//jtxt, _ := json.MarshalIndent(data["f0"], "", "  ")
-					//fmt.Printf("Data: %s\n", jtxt)
-					out = append(out, data["f0"])
-					//fmt.Printf("ID query traversal: %s\n", r)
-				}
-				return out, nil
-			},
-		}
-		queryFields[objName] = f
-	}
-
-	queryFields["_aggregation"] = buildAggregationField(client, graph, objects)
-
-	query := graphql.NewObject(
-		graphql.ObjectConfig{
-			Name:   "Query",
-			Fields: queryFields,
-		},
-	)
-	fmt.Printf("Query fields: %#v\n", queryFields)
-	return query
-}
diff --git a/endpoints/graphqlv2/filter_build.go b/endpoints/graphqlv2/filter_build.go
deleted file mode 100644
index 3d19c43d..00000000
--- a/endpoints/graphqlv2/filter_build.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package main
-
-import (
-	"github.com/bmeg/grip/log"
-
-	"github.com/bmeg/grip/gripql"
-)
-
-type FilterBuilder struct {
-	filter map[string]any
-}
-
-func NewFilterBuilder(i map[string]any) *FilterBuilder {
-	return &FilterBuilder{i}
-}
-
-func isFilterEQ(q map[string]any) (any, bool) {
-	for _, i := range []string{"=", "eq", "EQ"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func isFilterGT(q map[string]any) (any, bool) {
-	for _, i := range []string{">", "gt", "GT"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func isFilterLT(q map[string]any) (any, bool) {
-	for _, i := range []string{"<", "lt", "LT"} {
-		if val, ok := q[i]; ok {
-			return val, ok
-		}
-	}
-	return nil, false
-}
-
-func fieldMap(s string) string {
-	if s == "id" {
-		return "_gid"
-	}
-	return s
-}
-
-func (fb *FilterBuilder) ExtendGrip(q *gripql.Query) (*gripql.Query, error) {
-	if val, ok := isFilterEQ(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Eq(k, v))
-			}
-		}
-	}
-	if val, ok := isFilterGT(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Gt(k, v))
-			}
-		}
-	}
-	if val, ok := isFilterLT(fb.filter); ok {
-		if vMap, ok := val.(map[string]any); ok {
-			for k, v := range vMap {
-				k = fieldMap(k)
-				q = q.Has(gripql.Lt(k, v))
-			}
-		}
-	}
-	log.Infof("Filter Query %s", q.String())
-	return q, nil
-}
diff --git a/endpoints/graphqlv2/handler.go b/endpoints/graphqlv2/handler.go
deleted file mode 100644
index db19dd4a..00000000
--- a/endpoints/graphqlv2/handler.go
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
-GraphQL Web endpoint
-*/
-
-package main
-
-import (
-	"fmt"
-	"net/http"
-
-	"github.com/bmeg/grip/gripql"
-	"github.com/bmeg/grip/log"
-	"github.com/graphql-go/handler"
-)
-
-// handle the graphql queries for a single endpoint
-type graphHandler struct {
-	graph      string
-	gqlHandler *handler.Handler
-	timestamp  string
-	client     gripql.Client
-	//schema     *gripql.Graph
-}
-
-// Handler is a GraphQL endpoint to query the Grip database
-type Handler struct {
-	handlers map[string]*graphHandler
-	client   gripql.Client
-}
-
-// NewClientHTTPHandler initilizes a new GraphQLHandler
-func NewHTTPHandler(client gripql.Client, config map[string]string) (http.Handler, error) {
-	h := &Handler{
-		client:   client,
-		handlers: map[string]*graphHandler{},
-	}
-	return h, nil
-}
-
-// Static HTML that links to Apollo GraphQL query editor
-var sandBox = `
-<div id="sandbox" style="position:absolute;top:0;right:0;bottom:0;left:0"></div>
-<script src="https://embeddable-sandbox.cdn.apollographql.com/_latest/embeddable-sandbox.umd.production.min.js"></script>
-<script>
- new window.EmbeddedSandbox({
-   target: "#sandbox",
-   // Pass through your server href if you are embedding on an endpoint.
-   // Otherwise, you can pass whatever endpoint you want Sandbox to start up with here.
-   initialEndpoint: window.location.href,
- });
- // advanced options: https://www.apollographql.com/docs/studio/explorer/sandbox#embedding-sandbox
-</script>`
-
-// ServeHTTP responds to HTTP graphql requests
-func (gh *Handler) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
-	//log.Infof("Request for %s", request.URL.Path)
-	//If no graph provided, return the Query Editor page
-	if request.URL.Path == "" || request.URL.Path == "/" {
-		writer.Write([]byte(sandBox))
-		return
-	}
-	//pathRE := regexp.MustCompile("/(.+)$")
-	//graphName := pathRE.FindStringSubmatch(request.URL.Path)[1]
-	graphName := request.URL.Path
-	var handler *graphHandler
-	var ok bool
-	if handler, ok = gh.handlers[graphName]; ok {
-		//Call the setup function. If nothing has changed it will return without doing anything
-		err := handler.setup()
-		if err != nil {
-			http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-			return
-		}
-	} else {
-		//Graph handler was not found, so we'll need to set it up
-		var err error
-		handler, err = newGraphHandler(graphName, gh.client)
-		if err != nil {
-			http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-			return
-		}
-		gh.handlers[graphName] = handler
-	}
-	if handler != nil && handler.gqlHandler != nil {
-		handler.gqlHandler.ServeHTTP(writer, request)
-	} else {
-		http.Error(writer, fmt.Sprintf("No GraphQL handler found for graph: %s", graphName), http.StatusInternalServerError)
-	}
-}
-
-// newGraphHandler creates a new graphql handler from schema
-func newGraphHandler(graph string, client gripql.Client) (*graphHandler, error) {
-	o := &graphHandler{
-		graph:  graph,
-		client: client,
-	}
-	err := o.setup()
-	if err != nil {
-		return nil, err
-	}
-	return o, nil
-}
-
-// check timestamp to see if schema needs to be updated, and if so
-// rebuild graphql schema
-func (gh *graphHandler) setup() error {
-	ts, _ := gh.client.GetTimestamp(gh.graph)
-	if ts == nil || ts.Timestamp != gh.timestamp {
-		log.WithFields(log.Fields{"graph": gh.graph}).Info("Reloading GraphQL schema")
-		schema, err := gh.client.GetSchema(gh.graph)
-		if err != nil {
-			log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GetSchema error")
-			return err
-		}
-		gqlSchema, err := buildGraphQLSchema(schema, gh.client, gh.graph)
-		if err != nil {
-			log.WithFields(log.Fields{"graph": gh.graph, "error": err}).Error("GraphQL schema build failed")
-			gh.gqlHandler = nil
-			gh.timestamp = ""
-		} else {
-			log.WithFields(log.Fields{"graph": gh.graph}).Info("Built GraphQL schema")
-			gh.gqlHandler = handler.New(&handler.Config{
-				Schema: gqlSchema,
-			})
-			gh.timestamp = ts.Timestamp
-		}
-	}
-	return nil
-}
diff --git a/go.mod b/go.mod
index 2fa8bf45..626df45d 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,8 @@ require (
 	github.com/akuity/grpc-gateway-client v0.0.0-20231116134900-80c401329778
 	github.com/antlr/antlr4/runtime/Go/antlr v1.4.10
 	github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad
+	github.com/bmeg/jsonschema/v5 v5.3.4-0.20241111204732-55db82022a92
+	github.com/bmeg/jsonschemagraph v0.0.3-0.20241211234837-ff91c296d0a8
 	github.com/boltdb/bolt v1.3.1
 	github.com/casbin/casbin/v2 v2.97.0
 	github.com/cockroachdb/pebble v1.1.1
@@ -17,8 +19,6 @@ require (
 	github.com/dop251/goja v0.0.0-20240707163329-b1681fb2a2f5
 	github.com/felixge/httpsnoop v1.0.4
 	github.com/go-sql-driver/mysql v1.8.1
-	github.com/graphql-go/graphql v0.8.0
-	github.com/graphql-go/handler v0.2.3
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
 	github.com/hashicorp/go-multierror v1.1.1
@@ -31,7 +31,6 @@ require (
 	github.com/kr/pretty v0.3.1
 	github.com/lib/pq v1.10.9
 	github.com/logrusorgru/aurora v2.0.3+incompatible
-	github.com/machinebox/graphql v0.2.2
 	github.com/mattn/go-sqlite3 v1.14.23
 	github.com/minio/minio-go/v7 v7.0.73
 	github.com/mitchellh/hashstructure/v2 v2.0.2
@@ -45,13 +44,13 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/syndtr/goleveldb v1.0.0
 	go.mongodb.org/mongo-driver v1.11.9
-	golang.org/x/crypto v0.25.0
-	golang.org/x/net v0.27.0
-	golang.org/x/sync v0.7.0
+	golang.org/x/crypto v0.30.0
+	golang.org/x/net v0.32.0
+	golang.org/x/sync v0.10.0
 	google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d
 	google.golang.org/grpc v1.65.0
-	google.golang.org/protobuf v1.34.2
-	gopkg.in/olivere/elastic.v5 v5.0.86
+	google.golang.org/protobuf v1.35.2
+	gopkg.in/yaml.v3 v3.0.1
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -99,12 +98,9 @@ require (
 	github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
 	github.com/jessevdk/go-flags v1.6.1 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matryer/is v1.4.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
@@ -124,18 +120,18 @@ require (
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/rs/xid v1.5.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240424034433-3c2c7870ae76 // indirect
 	golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/term v0.22.0 // indirect
-	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	golang.org/x/term v0.27.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	gonum.org/v1/gonum v0.8.2 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d // indirect
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index 1915da2b..0f58ab19 100644
--- a/go.sum
+++ b/go.sum
@@ -26,12 +26,15 @@ github.com/antlr/antlr4/runtime/Go/antlr v1.4.10/go.mod h1:F7bn7fEU90QkQ3tnmaTx3
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9 h1:goHVqTbFX3AIo0tzGr14pgfAW2ZfPChKO21Z9MGf/gk=
 github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/aws/aws-sdk-go v1.29.11/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad h1:ICgBexeLB7iv/IQz4rsP+MimOXFZUwWSPojEypuOaQ8=
 github.com/bmeg/jsonpath v0.0.0-20210207014051-cca5355553ad/go.mod h1:ft96Irkp72C7ZrUWRenG7LrF0NKMxXdRvsypo5Njhm4=
+github.com/bmeg/jsonschema/v5 v5.3.4-0.20241111204732-55db82022a92 h1:Myx/j+WxfEg+P3nDaizR1hBpjKSLgvr4ydzgp1/1pAU=
+github.com/bmeg/jsonschema/v5 v5.3.4-0.20241111204732-55db82022a92/go.mod h1:6v27bSBKXyIDFqlKQbUSnHlekE1y6bDkgWCuVEaDPng=
+github.com/bmeg/jsonschemagraph v0.0.3-0.20241211234837-ff91c296d0a8 h1:tBnMKyTnGckEt9uM8NUaiaSi6eFRhdJncWsgfez2kQg=
+github.com/bmeg/jsonschemagraph v0.0.3-0.20241211234837-ff91c296d0a8/go.mod h1:wRzh5mRmHUv0zaqHCjFzHk+JivZRoxhuIAJyEjzq5hw=
 github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA=
@@ -127,7 +130,6 @@ github.com/go-resty/resty/v2 v2.13.1 h1:x+LHXBI2nMB1vqndymf26quycC4aggYJ7DECYbiz
 github.com/go-resty/resty/v2 v2.13.1/go.mod h1:GznXlLxkq6Nh4sU59rPmUw3VtgpO3aS96ORAI6Q7d+0=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible h1:a+iTbH5auLKxaNwQFg0B+TCYl6lbukKPc7b5x0n1s6Q=
 github.com/go-sourcemap/sourcemap v2.1.4+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
-github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
@@ -139,7 +141,6 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/glog v1.2.2 h1:1+mZ9upx1Dh6FmUTFR1naJ77miKiXgALjWOZ3NVFPmY=
 github.com/golang/glog v1.2.2/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
@@ -178,10 +179,6 @@ github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25d
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
-github.com/graphql-go/graphql v0.8.0 h1:JHRQMeQjofwqVvGwYnr8JnPTY0AxgVy1HpHSGPLdH0I=
-github.com/graphql-go/graphql v0.8.0/go.mod h1:nKiHzRM0qopJEwCITUuIsxk9PlVlwIiiI8pnJEhordQ=
-github.com/graphql-go/handler v0.2.3 h1:CANh8WPnl5M9uA25c2GBhPqJhE53Fg0Iue/fRNla71E=
-github.com/graphql-go/handler v0.2.3/go.mod h1:leLF6RpV5uZMN1CdImAxuiayrYYhOk33bZciaUGaXeU=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
@@ -225,11 +222,8 @@ github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bB
 github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=
 github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c=
 github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -248,7 +242,6 @@ github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042 h1:Vzdm5hdlLdpJOKK+hKtkV
 github.com/knakk/rdf v0.0.0-20190304171630-8521bf4c5042/go.mod h1:fYE0718xXI13XMYLc6iHtvXudfyCGMsZ9hxSM1Ommpg=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -259,14 +252,7 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
 github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
-github.com/machinebox/graphql v0.2.2 h1:dWKpJligYKhYKO5A2gvNhkJdQMNZeChZYyBbrZkBZfo=
-github.com/machinebox/graphql v0.2.2/go.mod h1:F+kbVMHuwrQ5tYgU9JXlnskM8nOaFxCAEolaQybkjWA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
-github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -301,7 +287,6 @@ github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
-github.com/olivere/elastic/v7 v7.0.12/go.mod h1:14rWX28Pnh3qCKYRVnSGXWLf9MbLonYS/4FDCY3LAPo=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
@@ -347,6 +332,8 @@ github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
+github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/segmentio/ksuid v1.0.4 h1:sBo2BdShXjmcugAMwjugoGUdUV0pcxY5mW4xKRn3v4c=
 github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O73XgrPE=
@@ -355,11 +342,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
 github.com/smarty/assertions v1.15.0/go.mod h1:yABtdzeQs6l1brC900WlRNwj6ZR55d7B+E8C6HtKdec=
-github.com/smartystreets/assertions v1.0.1/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
-github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 github.com/smartystreets/goconvey v1.8.1 h1:qGjIddxOk4grTu9JPOU31tVfq3cNdBlNa5sSznIX1xY=
 github.com/smartystreets/goconvey v1.8.1/go.mod h1:+/u4qLyY6x1jReYOp7GOM2FSt8aP9CzCZL03bI28W60=
-github.com/smartystreets/gunit v1.1.3/go.mod h1:EH5qMBab2UclzXUcpR8b93eHsIlp9u+pDQIRp5DZNzQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
@@ -416,7 +400,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.mongodb.org/mongo-driver v1.11.9 h1:JY1e2WLxwNuwdBAPgQxjf4BWweUGP86lF55n89cGZVA=
 go.mongodb.org/mongo-driver v1.11.9/go.mod h1:P8+TlbZtPFgjUrmnIF41z97iDnSMswJJu6cztZSlCTg=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
@@ -430,8 +413,8 @@ golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
 golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
-golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
+golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY=
+golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -455,7 +438,6 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
@@ -467,27 +449,25 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI=
+golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -515,16 +495,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
-golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -535,8 +515,8 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -568,7 +548,6 @@ gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZ
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY=
@@ -576,7 +555,6 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d h1:JU0iKnSg02Gmb5ZdV8nYsKEKsP6o/FGVWTrw4i1DA9A=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240711142825-46eb208f015d/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
@@ -589,16 +567,14 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
-google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/olivere/elastic.v5 v5.0.86 h1:xFy6qRCGAmo5Wjx96srho9BitLhZl2fcnpuidPwduXM=
-gopkg.in/olivere/elastic.v5 v5.0.86/go.mod h1:M3WNlsF+WhYn7api4D87NIflwTV/c0iVs8cqfWhK+68=
 gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=
 gopkg.in/sourcemap.v1 v1.0.5/go.mod h1:2RlvNNSMglmRrcvhfuzp4hQHwOtjxlbjX7UPY/GXb78=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
diff --git a/gripql/client.go b/gripql/client.go
index dc994e92..9124da46 100644
--- a/gripql/client.go
+++ b/gripql/client.go
@@ -66,6 +66,12 @@ func (client Client) AddSchema(graph *Graph) error {
 	return err
 }
 
+// AddJsonSchema adds a schema for a graph.
+func (client Client) AddJsonSchema(json *RawJson) error {
+	_, err := client.EditC.AddJsonSchema(context.Background(), json)
+	return err
+}
+
 func (client Client) DeleteEdge(graph string, id string) error {
 	_, err := client.EditC.DeleteEdge(context.Background(), &ElementID{Graph: graph, Id: id})
 	return err
@@ -181,6 +187,21 @@ func (client Client) BulkAdd(elemChan chan *GraphElement) error {
 	return err
 }
 
+func (client Client) BulkAddRaw(elemChan chan *RawJson) (error, *BulkJsonEditResult) {
+	sc, err := client.EditC.BulkAddRaw(context.Background())
+	if err != nil {
+		return err, nil
+	}
+	for elem := range elemChan {
+		err := sc.Send(elem)
+		if err != nil {
+			return err, nil
+		}
+	}
+	res, err := sc.CloseAndRecv()
+	return err, res
+}
+
 func (client Client) BulkDelete(delete *DeleteData) error {
 	_, err := client.EditC.BulkDelete(context.Background(), delete)
 	return err
diff --git a/gripql/graph.go b/gripql/graph.go
deleted file mode 100644
index 777a3f4a..00000000
--- a/gripql/graph.go
+++ /dev/null
@@ -1,193 +0,0 @@
-package gripql
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-
-	"google.golang.org/protobuf/encoding/protojson"
-	"sigs.k8s.io/yaml"
-)
-
-// ParseYAMLGraph parses a YAML doc into the given Graph instance.
-func ParseYAMLGraph(raw []byte) (*Graph, error) {
-	tmp := map[string]interface{}{}
-	err := yaml.Unmarshal(raw, &tmp)
-	if err != nil {
-		return nil, err
-	}
-	part, err := json.Marshal(tmp)
-	if err != nil {
-		return nil, err
-	}
-	g := &Graph{}
-	err = protojson.Unmarshal(part, g)
-	if err != nil {
-		return nil, err
-	}
-	return g, nil
-}
-
-func ParseYAMLGraphPath(relpath string) (*Graph, error) {
-	// Try to get absolute path. If it fails, fall back to relative path.
-	path, err := filepath.Abs(relpath)
-	if err != nil {
-		path = relpath
-	}
-	// Read file
-	source, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err)
-	}
-	return ParseYAMLGraph(source)
-}
-
-// ParseYAMLGraph parses a YAML doc into the given Graph instance.
-func ParseYAMLGraphs(raw []byte) ([]*Graph, error) {
-	graphs := []*Graph{}
-	tmp := []interface{}{}
-	err := yaml.Unmarshal(raw, &tmp)
-	if err != nil {
-		var tmp2 interface{}
-		err := yaml.Unmarshal(raw, &tmp2)
-		if err != nil {
-			return nil, err
-		}
-		tmp = append(tmp, tmp2)
-	}
-	for _, s := range tmp {
-		part, err := json.Marshal(s)
-		if err != nil {
-			return nil, err
-		}
-		g := &Graph{}
-		err = protojson.Unmarshal(part, g)
-		if err != nil {
-			return nil, err
-		}
-		if g.Graph == "" {
-			return nil, fmt.Errorf("missing graph name")
-		}
-		graphs = append(graphs, g)
-	}
-	return graphs, nil
-}
-
-// ParseJSONGraph parses a JSON doc into the given Graph instance.
-func ParseJSONGraphs(raw []byte) ([]*Graph, error) {
-	graphs := []*Graph{}
-	tmp := []interface{}{}
-	err := json.Unmarshal(raw, &tmp)
-	if err != nil {
-		var tmp2 interface{}
-		err := json.Unmarshal(raw, &tmp2)
-		if err != nil {
-			return nil, err
-		}
-		tmp = append(tmp, tmp2)
-	}
-	for _, s := range tmp {
-		part, err := json.Marshal(s)
-		if err != nil {
-			return nil, err
-		}
-		g := &Graph{}
-		err = protojson.Unmarshal(part, g)
-		if err != nil {
-			return nil, err
-		}
-		if g.Graph == "" {
-			return nil, fmt.Errorf("missing graph name")
-		}
-		graphs = append(graphs, g)
-	}
-	return graphs, nil
-}
-
-// ParseGraphYAMLFile parses a graph file, which is formatted in YAML,
-// and returns a slice of graph objects.
-func parseGraphFile(relpath string, format string) ([]*Graph, error) {
-	var graphs []*Graph
-	var err error
-
-	if relpath == "" {
-		return nil, fmt.Errorf("path is empty")
-	}
-
-	// Try to get absolute path. If it fails, fall back to relative path.
-	path, err := filepath.Abs(relpath)
-	if err != nil {
-		path = relpath
-	}
-
-	// Read file
-	source, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err)
-	}
-
-	// Parse file contents
-	switch format {
-	case "yaml":
-		graphs, err = ParseYAMLGraphs(source)
-	case "json":
-		graphs, err = ParseJSONGraphs(source)
-	default:
-		err = fmt.Errorf("unknown file format: %s", format)
-	}
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse graph at path %s: \n%v", path, err)
-	}
-	return graphs, nil
-}
-
-// ParseYAMLGraphFile parses a graph file, which is formatted in YAML,
-// and returns a slice of graph objects.
-func ParseYAMLGraphsFile(relpath string) ([]*Graph, error) {
-	return parseGraphFile(relpath, "yaml")
-}
-
-// ParseJSONGraphFile parses a graph file, which is formatted in JSON,
-// and returns a slice of graph objects.
-func ParseJSONGraphsFile(relpath string) ([]*Graph, error) {
-	return parseGraphFile(relpath, "json")
-}
-
-// GraphToYAMLString returns a graph formatted as a YAML string
-func GraphToYAMLString(graph *Graph) (string, error) {
-	out, err := protojson.Marshal(graph)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal graph: %v", err)
-	}
-	sb, err := yaml.JSONToYAML(out)
-	if err != nil {
-		return "", fmt.Errorf("failed to marshal graph: %v", err)
-	}
-	return string(sb), nil
-}
-
-// GraphToJSONString returns a graph formatted as a JSON string
-func GraphToJSONString(graph *Graph) (string, error) {
-	m := protojson.MarshalOptions{
-		UseEnumNumbers:  false,
-		EmitUnpopulated: false,
-		Indent:          "  ",
-		UseProtoNames:   false,
-	}
-	txt := m.Format(graph)
-	return txt, nil
-}
-
-func GraphMapToProto(data map[string]interface{}) (*Graph, error) {
-	part, err := json.Marshal(data)
-	if err != nil {
-		return nil, err
-	}
-	g := &Graph{}
-	err = protojson.Unmarshal(part, g)
-	if err != nil {
-		return nil, err
-	}
-	return g, nil
-}
diff --git a/gripql/gripql.gw.client.go b/gripql/gripql.gw.client.go
index a5c6f4ad..bb1f3c9d 100644
--- a/gripql/gripql.gw.client.go
+++ b/gripql/gripql.gw.client.go
@@ -177,6 +177,7 @@ type EditGatewayClient interface {
 	AddIndex(context.Context, *IndexID) (*EditResult, error)
 	DeleteIndex(context.Context, *IndexID) (*EditResult, error)
 	AddSchema(context.Context, *Graph) (*EditResult, error)
+	AddJsonSchema(context.Context, *RawJson) (*EditResult, error)
 	SampleSchema(context.Context, *GraphID) (*Graph, error)
 	AddMapping(context.Context, *Graph) (*EditResult, error)
 }
@@ -265,6 +266,13 @@ func (c *editGatewayClient) AddSchema(ctx context.Context, req *Graph) (*EditRes
 	return gateway.DoRequest[EditResult](ctx, gwReq)
 }
 
+func (c *editGatewayClient) AddJsonSchema(ctx context.Context, req *RawJson) (*EditResult, error) {
+	gwReq := c.gwc.NewRequest("POST", "/v1/graph/{graph}/jsonschema")
+	gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph))
+	gwReq.SetBody(req)
+	return gateway.DoRequest[EditResult](ctx, gwReq)
+}
+
 func (c *editGatewayClient) SampleSchema(ctx context.Context, req *GraphID) (*Graph, error) {
 	gwReq := c.gwc.NewRequest("GET", "/v1/graph/{graph}/schema-sample")
 	gwReq.SetPathParam("graph", fmt.Sprintf("%v", req.Graph))
diff --git a/gripql/gripql.pb.dgw.go b/gripql/gripql.pb.dgw.go
index 126a8ca6..8d04c81e 100644
--- a/gripql/gripql.pb.dgw.go
+++ b/gripql/gripql.pb.dgw.go
@@ -874,6 +874,84 @@ func (shim *EditDirectClient) BulkAdd(ctx context.Context, opts ...grpc.CallOpti
 }
 
 
+// Streaming data 'server' shim. Provides the Send/Recv funcs expected by the
+// user server code when dealing with a streaming input
+
+/* Start EditBulkAddRaw streaming input server */
+type directEditBulkAddRaw struct {
+  ctx context.Context
+  c   chan *RawJson
+  out chan *BulkJsonEditResult
+}
+
+func (dsm *directEditBulkAddRaw) Recv() (*RawJson, error) {
+	value, ok := <-dsm.c
+	if !ok {
+		return nil, io.EOF
+	}
+	return value, nil
+}
+
+func (dsm *directEditBulkAddRaw) Send(a *RawJson) error {
+	dsm.c <- a
+	return nil
+}
+
+func (dsm *directEditBulkAddRaw) Context() context.Context {
+	return dsm.ctx
+}
+
+func (dsm *directEditBulkAddRaw) SendAndClose(o *BulkJsonEditResult) error {
+  dsm.out <- o
+  close(dsm.out)
+  return nil
+}
+
+func (dsm *directEditBulkAddRaw) CloseAndRecv() (*BulkJsonEditResult, error) {
+  //close(dsm.c)
+  out := <- dsm.out
+  return out, nil
+}
+
+func (dsm *directEditBulkAddRaw) CloseSend() error             { close(dsm.c); return nil }
+func (dsm *directEditBulkAddRaw) SetTrailer(metadata.MD)       {}
+func (dsm *directEditBulkAddRaw) SetHeader(metadata.MD) error  { return nil }
+func (dsm *directEditBulkAddRaw) SendHeader(metadata.MD) error { return nil }
+func (dsm *directEditBulkAddRaw) SendMsg(m interface{}) error  { dsm.out <- m.(*BulkJsonEditResult); return nil }
+
+func (dsm *directEditBulkAddRaw) RecvMsg(m interface{}) error  { 
+	t, err := dsm.Recv()
+	mPtr := m.(*RawJson) 
+	if t != nil {
+    	*mPtr = *t
+	}
+	return err
+}
+
+func (dsm *directEditBulkAddRaw) Header() (metadata.MD, error) { return nil, nil }
+func (dsm *directEditBulkAddRaw) Trailer() metadata.MD         { return nil }
+/* End EditBulkAddRaw streaming input server */
+
+
+func (shim *EditDirectClient) BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddRawClient, error) {
+  md, _ := metadata.FromOutgoingContext(ctx)
+  ictx := metadata.NewIncomingContext(ctx, md)
+  w := &directEditBulkAddRaw{ictx, make(chan *RawJson, 100), make(chan *BulkJsonEditResult, 3)}
+  if shim.streamServerInt != nil {
+    info := grpc.StreamServerInfo{
+      FullMethod: "/gripql.Edit/BulkAddRaw",
+      IsClientStream: true,
+    }
+    go shim.streamServerInt(shim.server, w, &info, _Edit_BulkAddRaw_Handler)
+    return w, nil
+  }
+	go func() {
+		shim.server.BulkAddRaw(w)
+	}()
+	return w, nil
+}
+
+
 //AddGraph shim
 func (shim *EditDirectClient) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) {
   md, _ := metadata.FromOutgoingContext(ctx)
@@ -1034,6 +1112,26 @@ func (shim *EditDirectClient) AddSchema(ctx context.Context, in *Graph, opts ...
 	return shim.server.AddSchema(ictx, in)
 }
 
+//AddJsonSchema shim
+func (shim *EditDirectClient) AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error) {
+  md, _ := metadata.FromOutgoingContext(ctx)
+  ictx := metadata.NewIncomingContext(ctx, md)
+  if shim.unaryServerInt != nil {
+    handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+  		return shim.server.AddJsonSchema(ctx, req.(*RawJson))
+  	}
+    info := grpc.UnaryServerInfo{
+      FullMethod: "/gripql.Edit/AddJsonSchema",
+    }
+    o, err := shim.unaryServerInt(ictx, in, &info, handler)
+    if o == nil {
+      return nil, err
+    }
+    return o.(*EditResult), err
+  }
+	return shim.server.AddJsonSchema(ictx, in)
+}
+
 //SampleSchema shim
 func (shim *EditDirectClient) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) {
   md, _ := metadata.FromOutgoingContext(ctx)
diff --git a/gripql/gripql.pb.go b/gripql/gripql.pb.go
index 50626d24..cc3e9625 100644
--- a/gripql/gripql.pb.go
+++ b/gripql/gripql.pb.go
@@ -2597,6 +2597,61 @@ func (x *BulkEditResult) GetErrorCount() int32 {
 	return 0
 }
 
+type BulkJsonEditResult struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	InsertCount int32    `protobuf:"varint,1,opt,name=insert_count,json=insertCount,proto3" json:"insert_count,omitempty"`
+	Errors      []string `protobuf:"bytes,2,rep,name=errors,proto3" json:"errors,omitempty"`
+}
+
+func (x *BulkJsonEditResult) Reset() {
+	*x = BulkJsonEditResult{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gripql_proto_msgTypes[30]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BulkJsonEditResult) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BulkJsonEditResult) ProtoMessage() {}
+
+func (x *BulkJsonEditResult) ProtoReflect() protoreflect.Message {
+	mi := &file_gripql_proto_msgTypes[30]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BulkJsonEditResult.ProtoReflect.Descriptor instead.
+func (*BulkJsonEditResult) Descriptor() ([]byte, []int) {
+	return file_gripql_proto_rawDescGZIP(), []int{30}
+}
+
+func (x *BulkJsonEditResult) GetInsertCount() int32 {
+	if x != nil {
+		return x.InsertCount
+	}
+	return 0
+}
+
+func (x *BulkJsonEditResult) GetErrors() []string {
+	if x != nil {
+		return x.Errors
+	}
+	return nil
+}
+
 type GraphElement struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -2610,7 +2665,7 @@ type GraphElement struct {
 func (x *GraphElement) Reset() {
 	*x = GraphElement{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[30]
+		mi := &file_gripql_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2623,7 +2678,7 @@ func (x *GraphElement) String() string {
 func (*GraphElement) ProtoMessage() {}
 
 func (x *GraphElement) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[30]
+	mi := &file_gripql_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2636,7 +2691,7 @@ func (x *GraphElement) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GraphElement.ProtoReflect.Descriptor instead.
 func (*GraphElement) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{30}
+	return file_gripql_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *GraphElement) GetGraph() string {
@@ -2671,7 +2726,7 @@ type GraphID struct {
 func (x *GraphID) Reset() {
 	*x = GraphID{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[31]
+		mi := &file_gripql_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2684,7 +2739,7 @@ func (x *GraphID) String() string {
 func (*GraphID) ProtoMessage() {}
 
 func (x *GraphID) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[31]
+	mi := &file_gripql_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2697,7 +2752,7 @@ func (x *GraphID) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GraphID.ProtoReflect.Descriptor instead.
 func (*GraphID) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{31}
+	return file_gripql_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *GraphID) GetGraph() string {
@@ -2719,7 +2774,7 @@ type ElementID struct {
 func (x *ElementID) Reset() {
 	*x = ElementID{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[32]
+		mi := &file_gripql_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2732,7 +2787,7 @@ func (x *ElementID) String() string {
 func (*ElementID) ProtoMessage() {}
 
 func (x *ElementID) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[32]
+	mi := &file_gripql_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2745,7 +2800,7 @@ func (x *ElementID) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ElementID.ProtoReflect.Descriptor instead.
 func (*ElementID) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{32}
+	return file_gripql_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *ElementID) GetGraph() string {
@@ -2775,7 +2830,7 @@ type IndexID struct {
 func (x *IndexID) Reset() {
 	*x = IndexID{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[33]
+		mi := &file_gripql_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2788,7 +2843,7 @@ func (x *IndexID) String() string {
 func (*IndexID) ProtoMessage() {}
 
 func (x *IndexID) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[33]
+	mi := &file_gripql_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2801,7 +2856,7 @@ func (x *IndexID) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IndexID.ProtoReflect.Descriptor instead.
 func (*IndexID) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{33}
+	return file_gripql_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *IndexID) GetGraph() string {
@@ -2836,7 +2891,7 @@ type Timestamp struct {
 func (x *Timestamp) Reset() {
 	*x = Timestamp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[34]
+		mi := &file_gripql_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2849,7 +2904,7 @@ func (x *Timestamp) String() string {
 func (*Timestamp) ProtoMessage() {}
 
 func (x *Timestamp) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[34]
+	mi := &file_gripql_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2862,7 +2917,7 @@ func (x *Timestamp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Timestamp.ProtoReflect.Descriptor instead.
 func (*Timestamp) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{34}
+	return file_gripql_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *Timestamp) GetTimestamp() string {
@@ -2881,7 +2936,7 @@ type Empty struct {
 func (x *Empty) Reset() {
 	*x = Empty{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[35]
+		mi := &file_gripql_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2894,7 +2949,7 @@ func (x *Empty) String() string {
 func (*Empty) ProtoMessage() {}
 
 func (x *Empty) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[35]
+	mi := &file_gripql_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2907,7 +2962,7 @@ func (x *Empty) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Empty.ProtoReflect.Descriptor instead.
 func (*Empty) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{35}
+	return file_gripql_proto_rawDescGZIP(), []int{36}
 }
 
 type ListGraphsResponse struct {
@@ -2921,7 +2976,7 @@ type ListGraphsResponse struct {
 func (x *ListGraphsResponse) Reset() {
 	*x = ListGraphsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[36]
+		mi := &file_gripql_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2934,7 +2989,7 @@ func (x *ListGraphsResponse) String() string {
 func (*ListGraphsResponse) ProtoMessage() {}
 
 func (x *ListGraphsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[36]
+	mi := &file_gripql_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2947,7 +3002,7 @@ func (x *ListGraphsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListGraphsResponse.ProtoReflect.Descriptor instead.
 func (*ListGraphsResponse) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{36}
+	return file_gripql_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *ListGraphsResponse) GetGraphs() []string {
@@ -2968,7 +3023,7 @@ type ListIndicesResponse struct {
 func (x *ListIndicesResponse) Reset() {
 	*x = ListIndicesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[37]
+		mi := &file_gripql_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2981,7 +3036,7 @@ func (x *ListIndicesResponse) String() string {
 func (*ListIndicesResponse) ProtoMessage() {}
 
 func (x *ListIndicesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[37]
+	mi := &file_gripql_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2994,7 +3049,7 @@ func (x *ListIndicesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListIndicesResponse.ProtoReflect.Descriptor instead.
 func (*ListIndicesResponse) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{37}
+	return file_gripql_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *ListIndicesResponse) GetIndices() []*IndexID {
@@ -3016,7 +3071,7 @@ type ListLabelsResponse struct {
 func (x *ListLabelsResponse) Reset() {
 	*x = ListLabelsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[38]
+		mi := &file_gripql_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3029,7 +3084,7 @@ func (x *ListLabelsResponse) String() string {
 func (*ListLabelsResponse) ProtoMessage() {}
 
 func (x *ListLabelsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[38]
+	mi := &file_gripql_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3042,7 +3097,7 @@ func (x *ListLabelsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListLabelsResponse.ProtoReflect.Descriptor instead.
 func (*ListLabelsResponse) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{38}
+	return file_gripql_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *ListLabelsResponse) GetVertexLabels() []string {
@@ -3073,7 +3128,7 @@ type TableInfo struct {
 func (x *TableInfo) Reset() {
 	*x = TableInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[39]
+		mi := &file_gripql_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3086,7 +3141,7 @@ func (x *TableInfo) String() string {
 func (*TableInfo) ProtoMessage() {}
 
 func (x *TableInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[39]
+	mi := &file_gripql_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3099,7 +3154,7 @@ func (x *TableInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TableInfo.ProtoReflect.Descriptor instead.
 func (*TableInfo) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{39}
+	return file_gripql_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *TableInfo) GetSource() string {
@@ -3143,7 +3198,7 @@ type DeleteData struct {
 func (x *DeleteData) Reset() {
 	*x = DeleteData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[40]
+		mi := &file_gripql_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3156,7 +3211,7 @@ func (x *DeleteData) String() string {
 func (*DeleteData) ProtoMessage() {}
 
 func (x *DeleteData) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[40]
+	mi := &file_gripql_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3169,7 +3224,7 @@ func (x *DeleteData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteData.ProtoReflect.Descriptor instead.
 func (*DeleteData) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{40}
+	return file_gripql_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *DeleteData) GetGraph() string {
@@ -3193,6 +3248,69 @@ func (x *DeleteData) GetEdges() []string {
 	return nil
 }
 
+type RawJson struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Graph     string           `protobuf:"bytes,1,opt,name=graph,proto3" json:"graph,omitempty"`
+	ExtraArgs *structpb.Struct `protobuf:"bytes,2,opt,name=extra_args,json=extraArgs,proto3" json:"extra_args,omitempty"`
+	Data      *structpb.Struct `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"`
+}
+
+func (x *RawJson) Reset() {
+	*x = RawJson{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_gripql_proto_msgTypes[42]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RawJson) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RawJson) ProtoMessage() {}
+
+func (x *RawJson) ProtoReflect() protoreflect.Message {
+	mi := &file_gripql_proto_msgTypes[42]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RawJson.ProtoReflect.Descriptor instead.
+func (*RawJson) Descriptor() ([]byte, []int) {
+	return file_gripql_proto_rawDescGZIP(), []int{42}
+}
+
+func (x *RawJson) GetGraph() string {
+	if x != nil {
+		return x.Graph
+	}
+	return ""
+}
+
+func (x *RawJson) GetExtraArgs() *structpb.Struct {
+	if x != nil {
+		return x.ExtraArgs
+	}
+	return nil
+}
+
+func (x *RawJson) GetData() *structpb.Struct {
+	if x != nil {
+		return x.Data
+	}
+	return nil
+}
+
 type PluginConfig struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3206,7 +3324,7 @@ type PluginConfig struct {
 func (x *PluginConfig) Reset() {
 	*x = PluginConfig{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[41]
+		mi := &file_gripql_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3219,7 +3337,7 @@ func (x *PluginConfig) String() string {
 func (*PluginConfig) ProtoMessage() {}
 
 func (x *PluginConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[41]
+	mi := &file_gripql_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3232,7 +3350,7 @@ func (x *PluginConfig) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PluginConfig.ProtoReflect.Descriptor instead.
 func (*PluginConfig) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{41}
+	return file_gripql_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *PluginConfig) GetName() string {
@@ -3268,7 +3386,7 @@ type PluginStatus struct {
 func (x *PluginStatus) Reset() {
 	*x = PluginStatus{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[42]
+		mi := &file_gripql_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3281,7 +3399,7 @@ func (x *PluginStatus) String() string {
 func (*PluginStatus) ProtoMessage() {}
 
 func (x *PluginStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[42]
+	mi := &file_gripql_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3294,7 +3412,7 @@ func (x *PluginStatus) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PluginStatus.ProtoReflect.Descriptor instead.
 func (*PluginStatus) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{42}
+	return file_gripql_proto_rawDescGZIP(), []int{44}
 }
 
 func (x *PluginStatus) GetName() string {
@@ -3322,7 +3440,7 @@ type ListDriversResponse struct {
 func (x *ListDriversResponse) Reset() {
 	*x = ListDriversResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[43]
+		mi := &file_gripql_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3335,7 +3453,7 @@ func (x *ListDriversResponse) String() string {
 func (*ListDriversResponse) ProtoMessage() {}
 
 func (x *ListDriversResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[43]
+	mi := &file_gripql_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3348,7 +3466,7 @@ func (x *ListDriversResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListDriversResponse.ProtoReflect.Descriptor instead.
 func (*ListDriversResponse) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{43}
+	return file_gripql_proto_rawDescGZIP(), []int{45}
 }
 
 func (x *ListDriversResponse) GetDrivers() []string {
@@ -3369,7 +3487,7 @@ type ListPluginsResponse struct {
 func (x *ListPluginsResponse) Reset() {
 	*x = ListPluginsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_gripql_proto_msgTypes[44]
+		mi := &file_gripql_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3382,7 +3500,7 @@ func (x *ListPluginsResponse) String() string {
 func (*ListPluginsResponse) ProtoMessage() {}
 
 func (x *ListPluginsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_gripql_proto_msgTypes[44]
+	mi := &file_gripql_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3395,7 +3513,7 @@ func (x *ListPluginsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListPluginsResponse.ProtoReflect.Descriptor instead.
 func (*ListPluginsResponse) Descriptor() ([]byte, []int) {
-	return file_gripql_proto_rawDescGZIP(), []int{44}
+	return file_gripql_proto_rawDescGZIP(), []int{46}
 }
 
 func (x *ListPluginsResponse) GetPlugins() []string {
@@ -3692,281 +3810,306 @@ var file_gripql_proto_rawDesc = []byte{
 	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x43, 0x6f, 0x75,
 	0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
 	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f,
-	0x75, 0x6e, 0x74, 0x22, 0x6e, 0x0a, 0x0c, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d,
-	0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x26, 0x0a, 0x06, 0x76, 0x65, 0x72,
-	0x74, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70,
-	0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65,
-	0x78, 0x12, 0x20, 0x0a, 0x04, 0x65, 0x64, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x52, 0x04, 0x65,
-	0x64, 0x67, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x12, 0x14,
-	0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67,
-	0x72, 0x61, 0x70, 0x68, 0x22, 0x31, 0x0a, 0x09, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49,
-	0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x07, 0x49, 0x6e, 0x64, 0x65, 0x78,
+	0x75, 0x6e, 0x74, 0x22, 0x4f, 0x0a, 0x12, 0x42, 0x75, 0x6c, 0x6b, 0x4a, 0x73, 0x6f, 0x6e, 0x45,
+	0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x6e, 0x73,
+	0x65, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0b, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06,
+	0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x73, 0x22, 0x6e, 0x0a, 0x0c, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65,
+	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x26, 0x0a, 0x06, 0x76, 0x65,
+	0x72, 0x74, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x67, 0x72, 0x69,
+	0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x52, 0x06, 0x76, 0x65, 0x72, 0x74,
+	0x65, 0x78, 0x12, 0x20, 0x0a, 0x04, 0x65, 0x64, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x52, 0x04,
+	0x65, 0x64, 0x67, 0x65, 0x22, 0x1f, 0x0a, 0x07, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x12,
+	0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x67, 0x72, 0x61, 0x70, 0x68, 0x22, 0x31, 0x0a, 0x09, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
 	0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65,
-	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x14,
-	0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x66,
-	0x69, 0x65, 0x6c, 0x64, 0x22, 0x29, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
-	0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
-	0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74,
-	0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x22, 0x40, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e,
-	0x64, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x0a,
-	0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f,
-	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x52,
-	0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23,
-	0x0a, 0x0d, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x4c, 0x61, 0x62,
-	0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65,
-	0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x64, 0x67, 0x65, 0x4c, 0x61,
-	0x62, 0x65, 0x6c, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x09, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e,
-	0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16,
-	0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
-	0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x39, 0x0a, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x6d,
-	0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
-	0x6c, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x69, 0x6e, 0x6b,
-	0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x69, 0x6e, 0x6b, 0x4d, 0x61,
-	0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72,
+	0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x07, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12,
+	0x14, 0x0a, 0x05, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x66, 0x69, 0x65, 0x6c, 0x64, 0x22, 0x29, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6d, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
+	0x22, 0x07, 0x0a, 0x05, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x2c, 0x0a, 0x12, 0x4c, 0x69, 0x73,
+	0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x06, 0x67, 0x72, 0x61, 0x70, 0x68, 0x73, 0x22, 0x40, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x49,
+	0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29,
+	0x0a, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44,
+	0x52, 0x07, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x22, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x73,
+	0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x23, 0x0a, 0x0d, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x73,
+	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x4c, 0x61,
+	0x62, 0x65, 0x6c, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x64, 0x67, 0x65, 0x5f, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x65, 0x64, 0x67, 0x65, 0x4c,
+	0x61, 0x62, 0x65, 0x6c, 0x73, 0x22, 0xc6, 0x01, 0x0a, 0x09, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x06, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x39, 0x0a, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x5f,
+	0x6d, 0x61, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x67, 0x72, 0x69, 0x70,
+	0x71, 0x6c, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x4c, 0x69, 0x6e,
+	0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6c, 0x69, 0x6e, 0x6b, 0x4d,
+	0x61, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x4c, 0x69, 0x6e, 0x6b, 0x4d, 0x61, 0x70, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x54,
+	0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05,
+	0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x12, 0x14,
+	0x0a, 0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x65,
+	0x64, 0x67, 0x65, 0x73, 0x22, 0x84, 0x01, 0x0a, 0x07, 0x52, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e,
+	0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x36, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f,
+	0x61, 0x72, 0x67, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72,
+	0x75, 0x63, 0x74, 0x52, 0x09, 0x65, 0x78, 0x74, 0x72, 0x61, 0x41, 0x72, 0x67, 0x73, 0x12, 0x2b,
+	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53,
+	0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0xaf, 0x01, 0x0a, 0x0c,
+	0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+	0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x12, 0x38, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72,
 	0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
 	0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x54, 0x0a,
-	0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x67,
-	0x72, 0x61, 0x70, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x61, 0x70,
-	0x68, 0x12, 0x1a, 0x0a, 0x08, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x08, 0x76, 0x65, 0x72, 0x74, 0x69, 0x63, 0x65, 0x73, 0x12, 0x14, 0x0a,
-	0x05, 0x65, 0x64, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x65, 0x64,
-	0x67, 0x65, 0x73, 0x22, 0xaf, 0x01, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x12, 0x38, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x20, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74,
-	0x72, 0x79, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x39, 0x0a, 0x0b, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x38, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22,
-	0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73,
-	0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69,
-	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x73, 0x2a, 0xa2, 0x01, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x15, 0x0a, 0x11, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x5f, 0x43, 0x4f, 0x4e, 0x44, 0x49,
-	0x54, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x45, 0x51, 0x10, 0x01, 0x12, 0x07,
-	0x0a, 0x03, 0x4e, 0x45, 0x51, 0x10, 0x02, 0x12, 0x06, 0x0a, 0x02, 0x47, 0x54, 0x10, 0x03, 0x12,
-	0x07, 0x0a, 0x03, 0x47, 0x54, 0x45, 0x10, 0x04, 0x12, 0x06, 0x0a, 0x02, 0x4c, 0x54, 0x10, 0x05,
-	0x12, 0x07, 0x0a, 0x03, 0x4c, 0x54, 0x45, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53,
-	0x49, 0x44, 0x45, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x55, 0x54, 0x53, 0x49, 0x44, 0x45,
-	0x10, 0x08, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x45, 0x54, 0x57, 0x45, 0x45, 0x4e, 0x10, 0x09, 0x12,
-	0x0a, 0x0a, 0x06, 0x57, 0x49, 0x54, 0x48, 0x49, 0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x57,
-	0x49, 0x54, 0x48, 0x4f, 0x55, 0x54, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4e, 0x54,
-	0x41, 0x49, 0x4e, 0x53, 0x10, 0x0c, 0x2a, 0x49, 0x0a, 0x08, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61,
-	0x74, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, 0x55, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b,
-	0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x43,
-	0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52,
-	0x4f, 0x52, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10,
-	0x04, 0x2a, 0x4f, 0x0a, 0x09, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b,
-	0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53,
-	0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x55, 0x4d, 0x45, 0x52,
-	0x49, 0x43, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x03, 0x12, 0x07,
-	0x0a, 0x03, 0x4d, 0x41, 0x50, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x41, 0x52, 0x52, 0x41, 0x59,
-	0x10, 0x05, 0x32, 0xcf, 0x06, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x5a, 0x0a, 0x09,
-	0x54, 0x72, 0x61, 0x76, 0x65, 0x72, 0x73, 0x61, 0x6c, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70,
-	0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f,
+	0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x38, 0x0a,
+	0x0c, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x12, 0x0a,
+	0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x44,
+	0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x07, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x22, 0x2f, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74,
+	0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x07, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x2a, 0xa2, 0x01, 0x0a, 0x09, 0x43, 0x6f,
+	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x15, 0x0a, 0x11, 0x55, 0x4e, 0x4b, 0x4e, 0x4f,
+	0x57, 0x4e, 0x5f, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x00, 0x12, 0x06,
+	0x0a, 0x02, 0x45, 0x51, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x4e, 0x45, 0x51, 0x10, 0x02, 0x12,
+	0x06, 0x0a, 0x02, 0x47, 0x54, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x47, 0x54, 0x45, 0x10, 0x04,
+	0x12, 0x06, 0x0a, 0x02, 0x4c, 0x54, 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x54, 0x45, 0x10,
+	0x06, 0x12, 0x0a, 0x0a, 0x06, 0x49, 0x4e, 0x53, 0x49, 0x44, 0x45, 0x10, 0x07, 0x12, 0x0b, 0x0a,
+	0x07, 0x4f, 0x55, 0x54, 0x53, 0x49, 0x44, 0x45, 0x10, 0x08, 0x12, 0x0b, 0x0a, 0x07, 0x42, 0x45,
+	0x54, 0x57, 0x45, 0x45, 0x4e, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x57, 0x49, 0x54, 0x48, 0x49,
+	0x4e, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x49, 0x54, 0x48, 0x4f, 0x55, 0x54, 0x10, 0x0b,
+	0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4e, 0x54, 0x41, 0x49, 0x4e, 0x53, 0x10, 0x0c, 0x2a, 0x49,
+	0x0a, 0x08, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55,
+	0x45, 0x55, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e,
+	0x47, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10,
+	0x02, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07,
+	0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x04, 0x2a, 0x4f, 0x0a, 0x09, 0x46, 0x69, 0x65,
+	0x6c, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57,
+	0x4e, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x54, 0x52, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12,
+	0x0b, 0x0a, 0x07, 0x4e, 0x55, 0x4d, 0x45, 0x52, 0x49, 0x43, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04,
+	0x42, 0x4f, 0x4f, 0x4c, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x50, 0x10, 0x04, 0x12,
+	0x09, 0x0a, 0x05, 0x41, 0x52, 0x52, 0x41, 0x59, 0x10, 0x05, 0x32, 0xcf, 0x06, 0x0a, 0x05, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x12, 0x5a, 0x0a, 0x09, 0x54, 0x72, 0x61, 0x76, 0x65, 0x72, 0x73, 0x61,
+	0x6c, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51,
+	0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x1c, 0x3a, 0x01, 0x2a, 0x22, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68,
+	0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x30, 0x01,
+	0x12, 0x55, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44,
+	0x1a, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78,
+	0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72,
+	0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74,
+	0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x4f, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x45, 0x64,
+	0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0c, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45,
+	0x64, 0x67, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31,
+	0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65,
+	0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70,
+	0x71, 0x6c, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x23, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f,
+	0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x12, 0x4d, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a,
+	0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x20,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x12, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70,
+	0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61,
+	0x12, 0x4f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0f,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a,
+	0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x21,
+	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70,
+	0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e,
+	0x67, 0x12, 0x4a, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x12,
+	0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70,
+	0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c, 0x0a,
+	0x0b, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x12, 0x0f, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1b, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63,
+	0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67,
+	0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x5a, 0x0a, 0x0a, 0x4c,
+	0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70,
+	0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69,
+	0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17,
+	0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68,
+	0x7d, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x43, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45,
+	0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12,
+	0x09, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x30, 0x01, 0x32, 0xed, 0x04, 0x0a,
+	0x03, 0x4a, 0x6f, 0x62, 0x12, 0x50, 0x0a, 0x06, 0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x12, 0x12,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x4a, 0x6f, 0x62, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22,
+	0x15, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70,
+	0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x12, 0x4e, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f,
+	0x62, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70,
+	0x68, 0x49, 0x44, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x1d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f,
 	0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d,
-	0x2f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x30, 0x01, 0x12, 0x55, 0x0a, 0x09, 0x47, 0x65, 0x74, 0x56,
-	0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45,
-	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0e, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
-	0x6c, 0x2e, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f,
-	0x12, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61,
-	0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12,
-	0x4f, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x0c, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x67, 0x65, 0x22, 0x23, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b,
+	0x2f, 0x6a, 0x6f, 0x62, 0x30, 0x01, 0x12, 0x5e, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68,
+	0x4a, 0x6f, 0x62, 0x73, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72,
+	0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x27, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70,
+	0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x73, 0x65,
+	0x61, 0x72, 0x63, 0x68, 0x30, 0x01, 0x12, 0x54, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65,
+	0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a,
+	0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c,
+	0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x51, 0x0a, 0x06,
+	0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e,
+	0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b,
+	0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12,
+	0x59, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69,
+	0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a, 0x2f, 0x76,
+	0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f,
+	0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x30, 0x01, 0x12, 0x60, 0x0a, 0x09, 0x52, 0x65,
+	0x73, 0x75, 0x6d, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
+	0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x76,
+	0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f,
+	0x6a, 0x6f, 0x62, 0x2d, 0x72, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x30, 0x01, 0x32, 0xa7, 0x0a, 0x0a,
+	0x04, 0x45, 0x64, 0x69, 0x74, 0x12, 0x5f, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x74,
+	0x65, 0x78, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70,
+	0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x28, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x22, 0x3a, 0x06, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x22, 0x18, 0x2f, 0x76,
+	0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f,
+	0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x59, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x45, 0x64, 0x67,
+	0x65, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68,
+	0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
+	0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1e, 0x3a, 0x04, 0x65, 0x64, 0x67, 0x65, 0x22, 0x16, 0x2f, 0x76, 0x31, 0x2f, 0x67,
+	0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67,
+	0x65, 0x12, 0x4c, 0x0a, 0x07, 0x42, 0x75, 0x6c, 0x6b, 0x41, 0x64, 0x64, 0x12, 0x14, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65,
+	0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x42, 0x75, 0x6c, 0x6b,
+	0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x0b, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x28, 0x01, 0x12,
+	0x50, 0x0a, 0x0a, 0x42, 0x75, 0x6c, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x61, 0x77, 0x12, 0x0f, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x52, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x1a, 0x1a,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x42, 0x75, 0x6c, 0x6b, 0x4a, 0x73, 0x6f, 0x6e,
+	0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x13, 0x82, 0xd3, 0xe4, 0x93,
+	0x02, 0x0d, 0x22, 0x0b, 0x2f, 0x76, 0x31, 0x2f, 0x72, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x28,
+	0x01, 0x12, 0x4a, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x47, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f,
+	0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x12, 0x4d, 0x0a,
+	0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x2a, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67,
+	0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x12, 0x4a, 0x0a, 0x0a,
+	0x42, 0x75, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69,
+	0x70, 0x71, 0x6c, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x44, 0x61, 0x74, 0x61, 0x1a, 0x12,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x3a, 0x01, 0x2a, 0x2a, 0x09, 0x2f,
+	0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65,
+	0x74, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72,
+	0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22,
+	0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, 0x1d, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61,
+	0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65,
+	0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x58, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c,
+	0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
+	0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4,
+	0x93, 0x02, 0x1d, 0x2a, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b,
 	0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d,
-	0x12, 0x57, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70,
-	0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49,
-	0x44, 0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x12, 0x1b, 0x2f, 0x76,
+	0x12, 0x5b, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x01, 0x2a, 0x22, 0x1f, 0x2f, 0x76,
 	0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x4d, 0x0a, 0x09, 0x47, 0x65, 0x74,
+	0x69, 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x7d, 0x12, 0x63, 0x0a,
+	0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a, 0x27, 0x2f, 0x76, 0x31, 0x2f, 0x67,
+	0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64,
+	0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x7d, 0x2f, 0x7b, 0x66, 0x69, 0x65, 0x6c,
+	0x64, 0x7d, 0x12, 0x53, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12,
+	0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x1a, 0x12,
+	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x3a, 0x01, 0x2a, 0x22, 0x18, 0x2f,
+	0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d,
+	0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x5d, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x4a, 0x73,
+	0x6f, 0x6e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71,
+	0x6c, 0x2e, 0x52, 0x61, 0x77, 0x4a, 0x73, 0x6f, 0x6e, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70,
+	0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x27, 0x82,
+	0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72,
+	0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x73, 0x6f, 0x6e,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x57, 0x0a, 0x0c, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65,
 	0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e,
 	0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
-	0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x12, 0x18,
-	0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x4f, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4d,
-	0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e,
-	0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
-	0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19,
+	0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x12, 0x1f,
 	0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x4a, 0x0a, 0x0a, 0x4c, 0x69, 0x73,
-	0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e,
-	0x4c, 0x69, 0x73, 0x74, 0x47, 0x72, 0x61, 0x70, 0x68, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f,
-	0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x64,
-	0x69, 0x63, 0x65, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72,
-	0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x49, 0x6e, 0x64, 0x69, 0x63, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x1f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f,
-	0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e,
-	0x64, 0x65, 0x78, 0x12, 0x5a, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c,
-	0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68,
-	0x49, 0x44, 0x1a, 0x1a, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x4c, 0x61, 0x62, 0x65, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1f,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70,
-	0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12,
-	0x43, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x0d, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x11, 0x2e, 0x67,
-	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22,
-	0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x12, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x30, 0x01, 0x32, 0xed, 0x04, 0x0a, 0x03, 0x4a, 0x6f, 0x62, 0x12, 0x50, 0x0a, 0x06,
-	0x53, 0x75, 0x62, 0x6d, 0x69, 0x74, 0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e,
-	0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79, 0x1a, 0x10, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x20, 0x82, 0xd3,
-	0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61,
-	0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x12, 0x4e,
-	0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x10, 0x2e, 0x67, 0x72,
-	0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x22, 0x1d, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x30, 0x01, 0x12, 0x5e,
-	0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4a, 0x6f, 0x62, 0x73, 0x12, 0x12, 0x2e, 0x67,
-	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x51, 0x75, 0x65, 0x72, 0x79,
-	0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c,
-	0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x30, 0x01, 0x12, 0x54,
-	0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4a, 0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72,
-	0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x11, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72,
-	0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f,
-	0x7b, 0x69, 0x64, 0x7d, 0x12, 0x51, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x4a, 0x6f, 0x62, 0x12, 0x10,
-	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4a, 0x6f, 0x62,
-	0x1a, 0x11, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4a, 0x6f, 0x62, 0x53, 0x74, 0x61,
-	0x74, 0x75, 0x73, 0x22, 0x22, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x76, 0x31,
-	0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a,
-	0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x59, 0x0a, 0x07, 0x56, 0x69, 0x65, 0x77, 0x4a,
-	0x6f, 0x62, 0x12, 0x10, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75, 0x65, 0x72,
-	0x79, 0x4a, 0x6f, 0x62, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1f, 0x3a, 0x01, 0x2a, 0x22, 0x1a, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f,
-	0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2f, 0x7b, 0x69, 0x64, 0x7d,
-	0x30, 0x01, 0x12, 0x60, 0x0a, 0x09, 0x52, 0x65, 0x73, 0x75, 0x6d, 0x65, 0x4a, 0x6f, 0x62, 0x12,
-	0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x78, 0x74, 0x65, 0x6e, 0x64, 0x51,
-	0x75, 0x65, 0x72, 0x79, 0x1a, 0x13, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x51, 0x75,
-	0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x21, 0x3a, 0x01, 0x2a, 0x22, 0x1c, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f,
-	0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6a, 0x6f, 0x62, 0x2d, 0x72, 0x65, 0x73, 0x75,
-	0x6d, 0x65, 0x30, 0x01, 0x32, 0xf6, 0x08, 0x0a, 0x04, 0x45, 0x64, 0x69, 0x74, 0x12, 0x5f, 0x0a,
-	0x09, 0x41, 0x64, 0x64, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
-	0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x06, 0x76, 0x65,
-	0x72, 0x74, 0x65, 0x78, 0x22, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f,
-	0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x59,
-	0x0a, 0x07, 0x41, 0x64, 0x64, 0x45, 0x64, 0x67, 0x65, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70,
-	0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a,
-	0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x04, 0x65, 0x64, 0x67,
-	0x65, 0x22, 0x16, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72,
-	0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67, 0x65, 0x12, 0x4c, 0x0a, 0x07, 0x42, 0x75, 0x6c,
-	0x6b, 0x41, 0x64, 0x64, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72,
-	0x61, 0x70, 0x68, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x42, 0x75, 0x6c, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x22, 0x11, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0b, 0x22, 0x09, 0x2f, 0x76, 0x31, 0x2f,
-	0x67, 0x72, 0x61, 0x70, 0x68, 0x28, 0x01, 0x12, 0x4a, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x47, 0x72,
-	0x61, 0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61,
-	0x70, 0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64,
-	0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13,
-	0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61,
-	0x70, 0x68, 0x7d, 0x12, 0x4d, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x47, 0x72, 0x61,
-	0x70, 0x68, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70,
-	0x68, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69,
-	0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x2a,
-	0x11, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70,
-	0x68, 0x7d, 0x12, 0x4a, 0x0a, 0x0a, 0x42, 0x75, 0x6c, 0x6b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x12, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
-	0x44, 0x61, 0x74, 0x61, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64,
-	0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x14, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e,
-	0x3a, 0x01, 0x2a, 0x2a, 0x09, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x12, 0x5c,
-	0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x56, 0x65, 0x72, 0x74, 0x65, 0x78, 0x12, 0x11,
-	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49,
-	0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, 0x1d, 0x2f,
-	0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d,
-	0x2f, 0x76, 0x65, 0x72, 0x74, 0x65, 0x78, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x58, 0x0a, 0x0a,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x45, 0x64, 0x67, 0x65, 0x12, 0x11, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x1a, 0x12, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x2a, 0x1b, 0x2f, 0x76, 0x31, 0x2f, 0x67,
-	0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x65, 0x64, 0x67,
-	0x65, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x5b, 0x0a, 0x08, 0x41, 0x64, 0x64, 0x49, 0x6e, 0x64,
-	0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69,
-	0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x2a, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a,
-	0x01, 0x2a, 0x22, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67,
-	0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x7d, 0x12, 0x63, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x6e, 0x64,
-	0x65, 0x78, 0x12, 0x0f, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x49, 0x6e, 0x64, 0x65,
-	0x78, 0x49, 0x44, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69,
-	0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x2a,
-	0x27, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70,
-	0x68, 0x7d, 0x2f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x2f, 0x7b, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x7d,
-	0x2f, 0x7b, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x7d, 0x12, 0x53, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x53,
-	0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47,
-	0x72, 0x61, 0x70, 0x68, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64,
-	0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d,
-	0x3a, 0x01, 0x2a, 0x22, 0x18, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b,
-	0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x57, 0x0a,
-	0x0c, 0x53, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x0f, 0x2e,
-	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x49, 0x44, 0x1a, 0x0d,
-	0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x22, 0x27, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x21, 0x12, 0x1f, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68,
-	0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2d,
-	0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x55, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x70,
-	0x70, 0x69, 0x6e, 0x67, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72,
-	0x61, 0x70, 0x68, 0x1a, 0x12, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69,
-	0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a,
-	0x01, 0x2a, 0x22, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67,
-	0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x32, 0x82, 0x02,
-	0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x12, 0x57, 0x0a, 0x0b, 0x53,
-	0x74, 0x61, 0x72, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69,
-	0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
-	0x1a, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, 0x01,
-	0x2a, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x7b, 0x6e,
-	0x61, 0x6d, 0x65, 0x7d, 0x12, 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67,
-	0x69, 0x6e, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70,
-	0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, 0x75,
-	0x67, 0x69, 0x6e, 0x12, 0x4d, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65,
-	0x72, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74,
-	0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44,
-	0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12,
-	0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x72, 0x69, 0x76,
-	0x65, 0x72, 0x42, 0x1d, 0x5a, 0x1b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
-	0x2f, 0x62, 0x6d, 0x65, 0x67, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x71,
-	0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x7d, 0x2f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x2d, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12,
+	0x55, 0x0a, 0x0a, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0d, 0x2e,
+	0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x47, 0x72, 0x61, 0x70, 0x68, 0x1a, 0x12, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x76, 0x31,
+	0x2f, 0x67, 0x72, 0x61, 0x70, 0x68, 0x2f, 0x7b, 0x67, 0x72, 0x61, 0x70, 0x68, 0x7d, 0x2f, 0x6d,
+	0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x32, 0x82, 0x02, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x12, 0x57, 0x0a, 0x0b, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x12, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75,
+	0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x1a, 0x14, 0x2e, 0x67, 0x72, 0x69, 0x70,
+	0x71, 0x6c, 0x2e, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22,
+	0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, 0x01, 0x2a, 0x22, 0x11, 0x2f, 0x76, 0x31, 0x2f,
+	0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x2f, 0x7b, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x4d, 0x0a,
+	0x0b, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73, 0x12, 0x0d, 0x2e, 0x67,
+	0x72, 0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72,
+	0x69, 0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x73,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c,
+	0x12, 0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6c, 0x75, 0x67, 0x69, 0x6e, 0x12, 0x4d, 0x0a, 0x0b,
+	0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x12, 0x0d, 0x2e, 0x67, 0x72,
+	0x69, 0x70, 0x71, 0x6c, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1b, 0x2e, 0x67, 0x72, 0x69,
+	0x70, 0x71, 0x6c, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x73, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0c, 0x12,
+	0x0a, 0x2f, 0x76, 0x31, 0x2f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x42, 0x1d, 0x5a, 0x1b, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x6d, 0x65, 0x67, 0x2f, 0x67,
+	0x72, 0x69, 0x70, 0x2f, 0x67, 0x72, 0x69, 0x70, 0x71, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x33,
 }
 
 var (
@@ -3982,7 +4125,7 @@ func file_gripql_proto_rawDescGZIP() []byte {
 }
 
 var file_gripql_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_gripql_proto_msgTypes = make([]protoimpl.MessageInfo, 47)
+var file_gripql_proto_msgTypes = make([]protoimpl.MessageInfo, 49)
 var file_gripql_proto_goTypes = []any{
 	(Condition)(0),                 // 0: gripql.Condition
 	(JobState)(0),                  // 1: gripql.JobState
@@ -4017,162 +4160,170 @@ var file_gripql_proto_goTypes = []any{
 	(*JobStatus)(nil),              // 30: gripql.JobStatus
 	(*EditResult)(nil),             // 31: gripql.EditResult
 	(*BulkEditResult)(nil),         // 32: gripql.BulkEditResult
-	(*GraphElement)(nil),           // 33: gripql.GraphElement
-	(*GraphID)(nil),                // 34: gripql.GraphID
-	(*ElementID)(nil),              // 35: gripql.ElementID
-	(*IndexID)(nil),                // 36: gripql.IndexID
-	(*Timestamp)(nil),              // 37: gripql.Timestamp
-	(*Empty)(nil),                  // 38: gripql.Empty
-	(*ListGraphsResponse)(nil),     // 39: gripql.ListGraphsResponse
-	(*ListIndicesResponse)(nil),    // 40: gripql.ListIndicesResponse
-	(*ListLabelsResponse)(nil),     // 41: gripql.ListLabelsResponse
-	(*TableInfo)(nil),              // 42: gripql.TableInfo
-	(*DeleteData)(nil),             // 43: gripql.DeleteData
-	(*PluginConfig)(nil),           // 44: gripql.PluginConfig
-	(*PluginStatus)(nil),           // 45: gripql.PluginStatus
-	(*ListDriversResponse)(nil),    // 46: gripql.ListDriversResponse
-	(*ListPluginsResponse)(nil),    // 47: gripql.ListPluginsResponse
-	nil,                            // 48: gripql.TableInfo.LinkMapEntry
-	nil,                            // 49: gripql.PluginConfig.ConfigEntry
-	(*structpb.ListValue)(nil),     // 50: google.protobuf.ListValue
-	(*structpb.Value)(nil),         // 51: google.protobuf.Value
-	(*structpb.Struct)(nil),        // 52: google.protobuf.Struct
+	(*BulkJsonEditResult)(nil),     // 33: gripql.BulkJsonEditResult
+	(*GraphElement)(nil),           // 34: gripql.GraphElement
+	(*GraphID)(nil),                // 35: gripql.GraphID
+	(*ElementID)(nil),              // 36: gripql.ElementID
+	(*IndexID)(nil),                // 37: gripql.IndexID
+	(*Timestamp)(nil),              // 38: gripql.Timestamp
+	(*Empty)(nil),                  // 39: gripql.Empty
+	(*ListGraphsResponse)(nil),     // 40: gripql.ListGraphsResponse
+	(*ListIndicesResponse)(nil),    // 41: gripql.ListIndicesResponse
+	(*ListLabelsResponse)(nil),     // 42: gripql.ListLabelsResponse
+	(*TableInfo)(nil),              // 43: gripql.TableInfo
+	(*DeleteData)(nil),             // 44: gripql.DeleteData
+	(*RawJson)(nil),                // 45: gripql.RawJson
+	(*PluginConfig)(nil),           // 46: gripql.PluginConfig
+	(*PluginStatus)(nil),           // 47: gripql.PluginStatus
+	(*ListDriversResponse)(nil),    // 48: gripql.ListDriversResponse
+	(*ListPluginsResponse)(nil),    // 49: gripql.ListPluginsResponse
+	nil,                            // 50: gripql.TableInfo.LinkMapEntry
+	nil,                            // 51: gripql.PluginConfig.ConfigEntry
+	(*structpb.ListValue)(nil),     // 52: google.protobuf.ListValue
+	(*structpb.Value)(nil),         // 53: google.protobuf.Value
+	(*structpb.Struct)(nil),        // 54: google.protobuf.Struct
 }
 var file_gripql_proto_depIdxs = []int32{
-	25, // 0: gripql.Graph.vertices:type_name -> gripql.Vertex
-	26, // 1: gripql.Graph.edges:type_name -> gripql.Edge
-	6,  // 2: gripql.GraphQuery.query:type_name -> gripql.GraphStatement
-	6,  // 3: gripql.QuerySet.query:type_name -> gripql.GraphStatement
-	50, // 4: gripql.GraphStatement.v:type_name -> google.protobuf.ListValue
-	50, // 5: gripql.GraphStatement.e:type_name -> google.protobuf.ListValue
-	50, // 6: gripql.GraphStatement.in:type_name -> google.protobuf.ListValue
-	50, // 7: gripql.GraphStatement.out:type_name -> google.protobuf.ListValue
-	50, // 8: gripql.GraphStatement.both:type_name -> google.protobuf.ListValue
-	50, // 9: gripql.GraphStatement.in_e:type_name -> google.protobuf.ListValue
-	50, // 10: gripql.GraphStatement.out_e:type_name -> google.protobuf.ListValue
-	50, // 11: gripql.GraphStatement.both_e:type_name -> google.protobuf.ListValue
-	50, // 12: gripql.GraphStatement.in_null:type_name -> google.protobuf.ListValue
-	50, // 13: gripql.GraphStatement.out_null:type_name -> google.protobuf.ListValue
-	50, // 14: gripql.GraphStatement.in_e_null:type_name -> google.protobuf.ListValue
-	50, // 15: gripql.GraphStatement.out_e_null:type_name -> google.protobuf.ListValue
-	7,  // 16: gripql.GraphStatement.range:type_name -> gripql.Range
-	20, // 17: gripql.GraphStatement.has:type_name -> gripql.HasExpression
-	50, // 18: gripql.GraphStatement.has_label:type_name -> google.protobuf.ListValue
-	50, // 19: gripql.GraphStatement.has_key:type_name -> google.protobuf.ListValue
-	50, // 20: gripql.GraphStatement.has_id:type_name -> google.protobuf.ListValue
-	50, // 21: gripql.GraphStatement.distinct:type_name -> google.protobuf.ListValue
-	17, // 22: gripql.GraphStatement.pivot:type_name -> gripql.PivotStep
-	50, // 23: gripql.GraphStatement.fields:type_name -> google.protobuf.ListValue
-	9,  // 24: gripql.GraphStatement.aggregate:type_name -> gripql.Aggregations
-	51, // 25: gripql.GraphStatement.render:type_name -> google.protobuf.Value
-	50, // 26: gripql.GraphStatement.path:type_name -> google.protobuf.ListValue
-	22, // 27: gripql.GraphStatement.jump:type_name -> gripql.Jump
-	23, // 28: gripql.GraphStatement.set:type_name -> gripql.Set
-	24, // 29: gripql.GraphStatement.increment:type_name -> gripql.Increment
-	10, // 30: gripql.AggregationsRequest.aggregations:type_name -> gripql.Aggregate
-	10, // 31: gripql.Aggregations.aggregations:type_name -> gripql.Aggregate
-	11, // 32: gripql.Aggregate.term:type_name -> gripql.TermAggregation
-	12, // 33: gripql.Aggregate.percentile:type_name -> gripql.PercentileAggregation
-	13, // 34: gripql.Aggregate.histogram:type_name -> gripql.HistogramAggregation
-	14, // 35: gripql.Aggregate.field:type_name -> gripql.FieldAggregation
-	15, // 36: gripql.Aggregate.type:type_name -> gripql.TypeAggregation
-	16, // 37: gripql.Aggregate.count:type_name -> gripql.CountAggregation
-	51, // 38: gripql.NamedAggregationResult.key:type_name -> google.protobuf.Value
-	20, // 39: gripql.HasExpressionList.expressions:type_name -> gripql.HasExpression
-	19, // 40: gripql.HasExpression.and:type_name -> gripql.HasExpressionList
-	19, // 41: gripql.HasExpression.or:type_name -> gripql.HasExpressionList
-	20, // 42: gripql.HasExpression.not:type_name -> gripql.HasExpression
-	21, // 43: gripql.HasExpression.condition:type_name -> gripql.HasCondition
-	51, // 44: gripql.HasCondition.value:type_name -> google.protobuf.Value
-	0,  // 45: gripql.HasCondition.condition:type_name -> gripql.Condition
-	20, // 46: gripql.Jump.expression:type_name -> gripql.HasExpression
-	51, // 47: gripql.Set.value:type_name -> google.protobuf.Value
-	52, // 48: gripql.Vertex.data:type_name -> google.protobuf.Struct
-	52, // 49: gripql.Edge.data:type_name -> google.protobuf.Struct
-	25, // 50: gripql.QueryResult.vertex:type_name -> gripql.Vertex
-	26, // 51: gripql.QueryResult.edge:type_name -> gripql.Edge
-	18, // 52: gripql.QueryResult.aggregations:type_name -> gripql.NamedAggregationResult
-	51, // 53: gripql.QueryResult.render:type_name -> google.protobuf.Value
-	50, // 54: gripql.QueryResult.path:type_name -> google.protobuf.ListValue
-	6,  // 55: gripql.ExtendQuery.query:type_name -> gripql.GraphStatement
-	1,  // 56: gripql.JobStatus.state:type_name -> gripql.JobState
-	6,  // 57: gripql.JobStatus.query:type_name -> gripql.GraphStatement
-	25, // 58: gripql.GraphElement.vertex:type_name -> gripql.Vertex
-	26, // 59: gripql.GraphElement.edge:type_name -> gripql.Edge
-	36, // 60: gripql.ListIndicesResponse.indices:type_name -> gripql.IndexID
-	48, // 61: gripql.TableInfo.link_map:type_name -> gripql.TableInfo.LinkMapEntry
-	49, // 62: gripql.PluginConfig.config:type_name -> gripql.PluginConfig.ConfigEntry
-	4,  // 63: gripql.Query.Traversal:input_type -> gripql.GraphQuery
-	35, // 64: gripql.Query.GetVertex:input_type -> gripql.ElementID
-	35, // 65: gripql.Query.GetEdge:input_type -> gripql.ElementID
-	34, // 66: gripql.Query.GetTimestamp:input_type -> gripql.GraphID
-	34, // 67: gripql.Query.GetSchema:input_type -> gripql.GraphID
-	34, // 68: gripql.Query.GetMapping:input_type -> gripql.GraphID
-	38, // 69: gripql.Query.ListGraphs:input_type -> gripql.Empty
-	34, // 70: gripql.Query.ListIndices:input_type -> gripql.GraphID
-	34, // 71: gripql.Query.ListLabels:input_type -> gripql.GraphID
-	38, // 72: gripql.Query.ListTables:input_type -> gripql.Empty
-	4,  // 73: gripql.Job.Submit:input_type -> gripql.GraphQuery
-	34, // 74: gripql.Job.ListJobs:input_type -> gripql.GraphID
-	4,  // 75: gripql.Job.SearchJobs:input_type -> gripql.GraphQuery
-	28, // 76: gripql.Job.DeleteJob:input_type -> gripql.QueryJob
-	28, // 77: gripql.Job.GetJob:input_type -> gripql.QueryJob
-	28, // 78: gripql.Job.ViewJob:input_type -> gripql.QueryJob
-	29, // 79: gripql.Job.ResumeJob:input_type -> gripql.ExtendQuery
-	33, // 80: gripql.Edit.AddVertex:input_type -> gripql.GraphElement
-	33, // 81: gripql.Edit.AddEdge:input_type -> gripql.GraphElement
-	33, // 82: gripql.Edit.BulkAdd:input_type -> gripql.GraphElement
-	34, // 83: gripql.Edit.AddGraph:input_type -> gripql.GraphID
-	34, // 84: gripql.Edit.DeleteGraph:input_type -> gripql.GraphID
-	43, // 85: gripql.Edit.BulkDelete:input_type -> gripql.DeleteData
-	35, // 86: gripql.Edit.DeleteVertex:input_type -> gripql.ElementID
-	35, // 87: gripql.Edit.DeleteEdge:input_type -> gripql.ElementID
-	36, // 88: gripql.Edit.AddIndex:input_type -> gripql.IndexID
-	36, // 89: gripql.Edit.DeleteIndex:input_type -> gripql.IndexID
-	3,  // 90: gripql.Edit.AddSchema:input_type -> gripql.Graph
-	34, // 91: gripql.Edit.SampleSchema:input_type -> gripql.GraphID
-	3,  // 92: gripql.Edit.AddMapping:input_type -> gripql.Graph
-	44, // 93: gripql.Configure.StartPlugin:input_type -> gripql.PluginConfig
-	38, // 94: gripql.Configure.ListPlugins:input_type -> gripql.Empty
-	38, // 95: gripql.Configure.ListDrivers:input_type -> gripql.Empty
-	27, // 96: gripql.Query.Traversal:output_type -> gripql.QueryResult
-	25, // 97: gripql.Query.GetVertex:output_type -> gripql.Vertex
-	26, // 98: gripql.Query.GetEdge:output_type -> gripql.Edge
-	37, // 99: gripql.Query.GetTimestamp:output_type -> gripql.Timestamp
-	3,  // 100: gripql.Query.GetSchema:output_type -> gripql.Graph
-	3,  // 101: gripql.Query.GetMapping:output_type -> gripql.Graph
-	39, // 102: gripql.Query.ListGraphs:output_type -> gripql.ListGraphsResponse
-	40, // 103: gripql.Query.ListIndices:output_type -> gripql.ListIndicesResponse
-	41, // 104: gripql.Query.ListLabels:output_type -> gripql.ListLabelsResponse
-	42, // 105: gripql.Query.ListTables:output_type -> gripql.TableInfo
-	28, // 106: gripql.Job.Submit:output_type -> gripql.QueryJob
-	28, // 107: gripql.Job.ListJobs:output_type -> gripql.QueryJob
-	30, // 108: gripql.Job.SearchJobs:output_type -> gripql.JobStatus
-	30, // 109: gripql.Job.DeleteJob:output_type -> gripql.JobStatus
-	30, // 110: gripql.Job.GetJob:output_type -> gripql.JobStatus
-	27, // 111: gripql.Job.ViewJob:output_type -> gripql.QueryResult
-	27, // 112: gripql.Job.ResumeJob:output_type -> gripql.QueryResult
-	31, // 113: gripql.Edit.AddVertex:output_type -> gripql.EditResult
-	31, // 114: gripql.Edit.AddEdge:output_type -> gripql.EditResult
-	32, // 115: gripql.Edit.BulkAdd:output_type -> gripql.BulkEditResult
-	31, // 116: gripql.Edit.AddGraph:output_type -> gripql.EditResult
-	31, // 117: gripql.Edit.DeleteGraph:output_type -> gripql.EditResult
-	31, // 118: gripql.Edit.BulkDelete:output_type -> gripql.EditResult
-	31, // 119: gripql.Edit.DeleteVertex:output_type -> gripql.EditResult
-	31, // 120: gripql.Edit.DeleteEdge:output_type -> gripql.EditResult
-	31, // 121: gripql.Edit.AddIndex:output_type -> gripql.EditResult
-	31, // 122: gripql.Edit.DeleteIndex:output_type -> gripql.EditResult
-	31, // 123: gripql.Edit.AddSchema:output_type -> gripql.EditResult
-	3,  // 124: gripql.Edit.SampleSchema:output_type -> gripql.Graph
-	31, // 125: gripql.Edit.AddMapping:output_type -> gripql.EditResult
-	45, // 126: gripql.Configure.StartPlugin:output_type -> gripql.PluginStatus
-	47, // 127: gripql.Configure.ListPlugins:output_type -> gripql.ListPluginsResponse
-	46, // 128: gripql.Configure.ListDrivers:output_type -> gripql.ListDriversResponse
-	96, // [96:129] is the sub-list for method output_type
-	63, // [63:96] is the sub-list for method input_type
-	63, // [63:63] is the sub-list for extension type_name
-	63, // [63:63] is the sub-list for extension extendee
-	0,  // [0:63] is the sub-list for field type_name
+	25,  // 0: gripql.Graph.vertices:type_name -> gripql.Vertex
+	26,  // 1: gripql.Graph.edges:type_name -> gripql.Edge
+	6,   // 2: gripql.GraphQuery.query:type_name -> gripql.GraphStatement
+	6,   // 3: gripql.QuerySet.query:type_name -> gripql.GraphStatement
+	52,  // 4: gripql.GraphStatement.v:type_name -> google.protobuf.ListValue
+	52,  // 5: gripql.GraphStatement.e:type_name -> google.protobuf.ListValue
+	52,  // 6: gripql.GraphStatement.in:type_name -> google.protobuf.ListValue
+	52,  // 7: gripql.GraphStatement.out:type_name -> google.protobuf.ListValue
+	52,  // 8: gripql.GraphStatement.both:type_name -> google.protobuf.ListValue
+	52,  // 9: gripql.GraphStatement.in_e:type_name -> google.protobuf.ListValue
+	52,  // 10: gripql.GraphStatement.out_e:type_name -> google.protobuf.ListValue
+	52,  // 11: gripql.GraphStatement.both_e:type_name -> google.protobuf.ListValue
+	52,  // 12: gripql.GraphStatement.in_null:type_name -> google.protobuf.ListValue
+	52,  // 13: gripql.GraphStatement.out_null:type_name -> google.protobuf.ListValue
+	52,  // 14: gripql.GraphStatement.in_e_null:type_name -> google.protobuf.ListValue
+	52,  // 15: gripql.GraphStatement.out_e_null:type_name -> google.protobuf.ListValue
+	7,   // 16: gripql.GraphStatement.range:type_name -> gripql.Range
+	20,  // 17: gripql.GraphStatement.has:type_name -> gripql.HasExpression
+	52,  // 18: gripql.GraphStatement.has_label:type_name -> google.protobuf.ListValue
+	52,  // 19: gripql.GraphStatement.has_key:type_name -> google.protobuf.ListValue
+	52,  // 20: gripql.GraphStatement.has_id:type_name -> google.protobuf.ListValue
+	52,  // 21: gripql.GraphStatement.distinct:type_name -> google.protobuf.ListValue
+	17,  // 22: gripql.GraphStatement.pivot:type_name -> gripql.PivotStep
+	52,  // 23: gripql.GraphStatement.fields:type_name -> google.protobuf.ListValue
+	9,   // 24: gripql.GraphStatement.aggregate:type_name -> gripql.Aggregations
+	53,  // 25: gripql.GraphStatement.render:type_name -> google.protobuf.Value
+	52,  // 26: gripql.GraphStatement.path:type_name -> google.protobuf.ListValue
+	22,  // 27: gripql.GraphStatement.jump:type_name -> gripql.Jump
+	23,  // 28: gripql.GraphStatement.set:type_name -> gripql.Set
+	24,  // 29: gripql.GraphStatement.increment:type_name -> gripql.Increment
+	10,  // 30: gripql.AggregationsRequest.aggregations:type_name -> gripql.Aggregate
+	10,  // 31: gripql.Aggregations.aggregations:type_name -> gripql.Aggregate
+	11,  // 32: gripql.Aggregate.term:type_name -> gripql.TermAggregation
+	12,  // 33: gripql.Aggregate.percentile:type_name -> gripql.PercentileAggregation
+	13,  // 34: gripql.Aggregate.histogram:type_name -> gripql.HistogramAggregation
+	14,  // 35: gripql.Aggregate.field:type_name -> gripql.FieldAggregation
+	15,  // 36: gripql.Aggregate.type:type_name -> gripql.TypeAggregation
+	16,  // 37: gripql.Aggregate.count:type_name -> gripql.CountAggregation
+	53,  // 38: gripql.NamedAggregationResult.key:type_name -> google.protobuf.Value
+	20,  // 39: gripql.HasExpressionList.expressions:type_name -> gripql.HasExpression
+	19,  // 40: gripql.HasExpression.and:type_name -> gripql.HasExpressionList
+	19,  // 41: gripql.HasExpression.or:type_name -> gripql.HasExpressionList
+	20,  // 42: gripql.HasExpression.not:type_name -> gripql.HasExpression
+	21,  // 43: gripql.HasExpression.condition:type_name -> gripql.HasCondition
+	53,  // 44: gripql.HasCondition.value:type_name -> google.protobuf.Value
+	0,   // 45: gripql.HasCondition.condition:type_name -> gripql.Condition
+	20,  // 46: gripql.Jump.expression:type_name -> gripql.HasExpression
+	53,  // 47: gripql.Set.value:type_name -> google.protobuf.Value
+	54,  // 48: gripql.Vertex.data:type_name -> google.protobuf.Struct
+	54,  // 49: gripql.Edge.data:type_name -> google.protobuf.Struct
+	25,  // 50: gripql.QueryResult.vertex:type_name -> gripql.Vertex
+	26,  // 51: gripql.QueryResult.edge:type_name -> gripql.Edge
+	18,  // 52: gripql.QueryResult.aggregations:type_name -> gripql.NamedAggregationResult
+	53,  // 53: gripql.QueryResult.render:type_name -> google.protobuf.Value
+	52,  // 54: gripql.QueryResult.path:type_name -> google.protobuf.ListValue
+	6,   // 55: gripql.ExtendQuery.query:type_name -> gripql.GraphStatement
+	1,   // 56: gripql.JobStatus.state:type_name -> gripql.JobState
+	6,   // 57: gripql.JobStatus.query:type_name -> gripql.GraphStatement
+	25,  // 58: gripql.GraphElement.vertex:type_name -> gripql.Vertex
+	26,  // 59: gripql.GraphElement.edge:type_name -> gripql.Edge
+	37,  // 60: gripql.ListIndicesResponse.indices:type_name -> gripql.IndexID
+	50,  // 61: gripql.TableInfo.link_map:type_name -> gripql.TableInfo.LinkMapEntry
+	54,  // 62: gripql.RawJson.extra_args:type_name -> google.protobuf.Struct
+	54,  // 63: gripql.RawJson.data:type_name -> google.protobuf.Struct
+	51,  // 64: gripql.PluginConfig.config:type_name -> gripql.PluginConfig.ConfigEntry
+	4,   // 65: gripql.Query.Traversal:input_type -> gripql.GraphQuery
+	36,  // 66: gripql.Query.GetVertex:input_type -> gripql.ElementID
+	36,  // 67: gripql.Query.GetEdge:input_type -> gripql.ElementID
+	35,  // 68: gripql.Query.GetTimestamp:input_type -> gripql.GraphID
+	35,  // 69: gripql.Query.GetSchema:input_type -> gripql.GraphID
+	35,  // 70: gripql.Query.GetMapping:input_type -> gripql.GraphID
+	39,  // 71: gripql.Query.ListGraphs:input_type -> gripql.Empty
+	35,  // 72: gripql.Query.ListIndices:input_type -> gripql.GraphID
+	35,  // 73: gripql.Query.ListLabels:input_type -> gripql.GraphID
+	39,  // 74: gripql.Query.ListTables:input_type -> gripql.Empty
+	4,   // 75: gripql.Job.Submit:input_type -> gripql.GraphQuery
+	35,  // 76: gripql.Job.ListJobs:input_type -> gripql.GraphID
+	4,   // 77: gripql.Job.SearchJobs:input_type -> gripql.GraphQuery
+	28,  // 78: gripql.Job.DeleteJob:input_type -> gripql.QueryJob
+	28,  // 79: gripql.Job.GetJob:input_type -> gripql.QueryJob
+	28,  // 80: gripql.Job.ViewJob:input_type -> gripql.QueryJob
+	29,  // 81: gripql.Job.ResumeJob:input_type -> gripql.ExtendQuery
+	34,  // 82: gripql.Edit.AddVertex:input_type -> gripql.GraphElement
+	34,  // 83: gripql.Edit.AddEdge:input_type -> gripql.GraphElement
+	34,  // 84: gripql.Edit.BulkAdd:input_type -> gripql.GraphElement
+	45,  // 85: gripql.Edit.BulkAddRaw:input_type -> gripql.RawJson
+	35,  // 86: gripql.Edit.AddGraph:input_type -> gripql.GraphID
+	35,  // 87: gripql.Edit.DeleteGraph:input_type -> gripql.GraphID
+	44,  // 88: gripql.Edit.BulkDelete:input_type -> gripql.DeleteData
+	36,  // 89: gripql.Edit.DeleteVertex:input_type -> gripql.ElementID
+	36,  // 90: gripql.Edit.DeleteEdge:input_type -> gripql.ElementID
+	37,  // 91: gripql.Edit.AddIndex:input_type -> gripql.IndexID
+	37,  // 92: gripql.Edit.DeleteIndex:input_type -> gripql.IndexID
+	3,   // 93: gripql.Edit.AddSchema:input_type -> gripql.Graph
+	45,  // 94: gripql.Edit.AddJsonSchema:input_type -> gripql.RawJson
+	35,  // 95: gripql.Edit.SampleSchema:input_type -> gripql.GraphID
+	3,   // 96: gripql.Edit.AddMapping:input_type -> gripql.Graph
+	46,  // 97: gripql.Configure.StartPlugin:input_type -> gripql.PluginConfig
+	39,  // 98: gripql.Configure.ListPlugins:input_type -> gripql.Empty
+	39,  // 99: gripql.Configure.ListDrivers:input_type -> gripql.Empty
+	27,  // 100: gripql.Query.Traversal:output_type -> gripql.QueryResult
+	25,  // 101: gripql.Query.GetVertex:output_type -> gripql.Vertex
+	26,  // 102: gripql.Query.GetEdge:output_type -> gripql.Edge
+	38,  // 103: gripql.Query.GetTimestamp:output_type -> gripql.Timestamp
+	3,   // 104: gripql.Query.GetSchema:output_type -> gripql.Graph
+	3,   // 105: gripql.Query.GetMapping:output_type -> gripql.Graph
+	40,  // 106: gripql.Query.ListGraphs:output_type -> gripql.ListGraphsResponse
+	41,  // 107: gripql.Query.ListIndices:output_type -> gripql.ListIndicesResponse
+	42,  // 108: gripql.Query.ListLabels:output_type -> gripql.ListLabelsResponse
+	43,  // 109: gripql.Query.ListTables:output_type -> gripql.TableInfo
+	28,  // 110: gripql.Job.Submit:output_type -> gripql.QueryJob
+	28,  // 111: gripql.Job.ListJobs:output_type -> gripql.QueryJob
+	30,  // 112: gripql.Job.SearchJobs:output_type -> gripql.JobStatus
+	30,  // 113: gripql.Job.DeleteJob:output_type -> gripql.JobStatus
+	30,  // 114: gripql.Job.GetJob:output_type -> gripql.JobStatus
+	27,  // 115: gripql.Job.ViewJob:output_type -> gripql.QueryResult
+	27,  // 116: gripql.Job.ResumeJob:output_type -> gripql.QueryResult
+	31,  // 117: gripql.Edit.AddVertex:output_type -> gripql.EditResult
+	31,  // 118: gripql.Edit.AddEdge:output_type -> gripql.EditResult
+	32,  // 119: gripql.Edit.BulkAdd:output_type -> gripql.BulkEditResult
+	33,  // 120: gripql.Edit.BulkAddRaw:output_type -> gripql.BulkJsonEditResult
+	31,  // 121: gripql.Edit.AddGraph:output_type -> gripql.EditResult
+	31,  // 122: gripql.Edit.DeleteGraph:output_type -> gripql.EditResult
+	31,  // 123: gripql.Edit.BulkDelete:output_type -> gripql.EditResult
+	31,  // 124: gripql.Edit.DeleteVertex:output_type -> gripql.EditResult
+	31,  // 125: gripql.Edit.DeleteEdge:output_type -> gripql.EditResult
+	31,  // 126: gripql.Edit.AddIndex:output_type -> gripql.EditResult
+	31,  // 127: gripql.Edit.DeleteIndex:output_type -> gripql.EditResult
+	31,  // 128: gripql.Edit.AddSchema:output_type -> gripql.EditResult
+	31,  // 129: gripql.Edit.AddJsonSchema:output_type -> gripql.EditResult
+	3,   // 130: gripql.Edit.SampleSchema:output_type -> gripql.Graph
+	31,  // 131: gripql.Edit.AddMapping:output_type -> gripql.EditResult
+	47,  // 132: gripql.Configure.StartPlugin:output_type -> gripql.PluginStatus
+	49,  // 133: gripql.Configure.ListPlugins:output_type -> gripql.ListPluginsResponse
+	48,  // 134: gripql.Configure.ListDrivers:output_type -> gripql.ListDriversResponse
+	100, // [100:135] is the sub-list for method output_type
+	65,  // [65:100] is the sub-list for method input_type
+	65,  // [65:65] is the sub-list for extension type_name
+	65,  // [65:65] is the sub-list for extension extendee
+	0,   // [0:65] is the sub-list for field type_name
 }
 
 func init() { file_gripql_proto_init() }
@@ -4542,7 +4693,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[30].Exporter = func(v any, i int) any {
-			switch v := v.(*GraphElement); i {
+			switch v := v.(*BulkJsonEditResult); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4554,7 +4705,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[31].Exporter = func(v any, i int) any {
-			switch v := v.(*GraphID); i {
+			switch v := v.(*GraphElement); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4566,7 +4717,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[32].Exporter = func(v any, i int) any {
-			switch v := v.(*ElementID); i {
+			switch v := v.(*GraphID); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4578,7 +4729,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[33].Exporter = func(v any, i int) any {
-			switch v := v.(*IndexID); i {
+			switch v := v.(*ElementID); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4590,7 +4741,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[34].Exporter = func(v any, i int) any {
-			switch v := v.(*Timestamp); i {
+			switch v := v.(*IndexID); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4602,7 +4753,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[35].Exporter = func(v any, i int) any {
-			switch v := v.(*Empty); i {
+			switch v := v.(*Timestamp); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4614,7 +4765,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[36].Exporter = func(v any, i int) any {
-			switch v := v.(*ListGraphsResponse); i {
+			switch v := v.(*Empty); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4626,7 +4777,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[37].Exporter = func(v any, i int) any {
-			switch v := v.(*ListIndicesResponse); i {
+			switch v := v.(*ListGraphsResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4638,7 +4789,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[38].Exporter = func(v any, i int) any {
-			switch v := v.(*ListLabelsResponse); i {
+			switch v := v.(*ListIndicesResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4650,7 +4801,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[39].Exporter = func(v any, i int) any {
-			switch v := v.(*TableInfo); i {
+			switch v := v.(*ListLabelsResponse); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4662,7 +4813,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[40].Exporter = func(v any, i int) any {
-			switch v := v.(*DeleteData); i {
+			switch v := v.(*TableInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4674,7 +4825,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[41].Exporter = func(v any, i int) any {
-			switch v := v.(*PluginConfig); i {
+			switch v := v.(*DeleteData); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4686,7 +4837,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[42].Exporter = func(v any, i int) any {
-			switch v := v.(*PluginStatus); i {
+			switch v := v.(*RawJson); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4698,7 +4849,7 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[43].Exporter = func(v any, i int) any {
-			switch v := v.(*ListDriversResponse); i {
+			switch v := v.(*PluginConfig); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -4710,6 +4861,30 @@ func file_gripql_proto_init() {
 			}
 		}
 		file_gripql_proto_msgTypes[44].Exporter = func(v any, i int) any {
+			switch v := v.(*PluginStatus); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gripql_proto_msgTypes[45].Exporter = func(v any, i int) any {
+			switch v := v.(*ListDriversResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_gripql_proto_msgTypes[46].Exporter = func(v any, i int) any {
 			switch v := v.(*ListPluginsResponse); i {
 			case 0:
 				return &v.state
@@ -4785,7 +4960,7 @@ func file_gripql_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_gripql_proto_rawDesc,
 			NumEnums:      3,
-			NumMessages:   47,
+			NumMessages:   49,
 			NumExtensions: 0,
 			NumServices:   4,
 		},
diff --git a/gripql/gripql.pb.gw.go b/gripql/gripql.pb.gw.go
index 74aa9dde..096ce86f 100644
--- a/gripql/gripql.pb.gw.go
+++ b/gripql/gripql.pb.gw.go
@@ -10,6 +10,7 @@ package gripql
 
 import (
 	"context"
+	"errors"
 	"io"
 	"net/http"
 
@@ -24,38 +25,33 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var _ codes.Code
-var _ io.Reader
-var _ status.Status
-var _ = runtime.String
-var _ = utilities.NewDoubleArray
-var _ = metadata.Join
+var (
+	_ codes.Code
+	_ io.Reader
+	_ status.Status
+	_ = errors.New
+	_ = runtime.String
+	_ = utilities.NewDoubleArray
+	_ = metadata.Join
+)
 
 func request_Query_Traversal_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (Query_TraversalClient, runtime.ServerMetadata, error) {
-	var protoReq GraphQuery
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphQuery
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	stream, err := client.Traversal(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -66,435 +62,315 @@ func request_Query_Traversal_0(ctx context.Context, marshaler runtime.Marshaler,
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
 func request_Query_GetVertex_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.GetVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_GetVertex_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.GetVertex(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_GetEdge_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.GetEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_GetEdge_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.GetEdge(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_GetTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.GetTimestamp(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_GetTimestamp_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.GetTimestamp(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_GetSchema_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.GetSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_GetSchema_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.GetSchema(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_GetMapping_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.GetMapping(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_GetMapping_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.GetMapping(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_ListGraphs_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := client.ListGraphs(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_ListGraphs_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := server.ListGraphs(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_ListIndices_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.ListIndices(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_ListIndices_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.ListIndices(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_ListLabels_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.ListLabels(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Query_ListLabels_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.ListLabels(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Query_ListTables_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (Query_ListTablesClient, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	stream, err := client.ListTables(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -505,90 +381,64 @@ func request_Query_ListTables_0(ctx context.Context, marshaler runtime.Marshaler
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
 func request_Job_Submit_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphQuery
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphQuery
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.Submit(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Job_Submit_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphQuery
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphQuery
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.Submit(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Job_ListJobs_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ListJobsClient, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	stream, err := client.ListJobs(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -599,34 +449,25 @@ func request_Job_ListJobs_0(ctx context.Context, marshaler runtime.Marshaler, cl
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
 func request_Job_SearchJobs_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_SearchJobsClient, runtime.ServerMetadata, error) {
-	var protoReq GraphQuery
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphQuery
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	stream, err := client.SearchJobs(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -637,188 +478,137 @@ func request_Job_SearchJobs_0(ctx context.Context, marshaler runtime.Marshaler,
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
 func request_Job_DeleteJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryJob
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq QueryJob
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.DeleteJob(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Job_DeleteJob_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryJob
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq QueryJob
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.DeleteJob(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Job_GetJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryJob
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq QueryJob
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.GetJob(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Job_GetJob_0(ctx context.Context, marshaler runtime.Marshaler, server JobServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq QueryJob
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq QueryJob
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.GetJob(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Job_ViewJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ViewJobClient, runtime.ServerMetadata, error) {
-	var protoReq QueryJob
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq QueryJob
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	stream, err := client.ViewJob(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -829,34 +619,25 @@ func request_Job_ViewJob_0(ctx context.Context, marshaler runtime.Marshaler, cli
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
 func request_Job_ResumeJob_0(ctx context.Context, marshaler runtime.Marshaler, client JobClient, req *http.Request, pathParams map[string]string) (Job_ResumeJobClient, runtime.ServerMetadata, error) {
-	var protoReq ExtendQuery
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ExtendQuery
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	stream, err := client.ResumeJob(ctx, &protoReq)
 	if err != nil {
 		return nil, metadata, err
@@ -867,163 +648,118 @@ func request_Job_ResumeJob_0(ctx context.Context, marshaler runtime.Marshaler, c
 	}
 	metadata.HeaderMD = header
 	return stream, metadata, nil
-
 }
 
-var (
-	filter_Edit_AddVertex_0 = &utilities.DoubleArray{Encoding: map[string]int{"vertex": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
-)
+var filter_Edit_AddVertex_0 = &utilities.DoubleArray{Encoding: map[string]int{"vertex": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
 
 func request_Edit_AddVertex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphElement
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphElement
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddVertex_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := client.AddVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddVertex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphElement
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphElement
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Vertex); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddVertex_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := server.AddVertex(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
-var (
-	filter_Edit_AddEdge_0 = &utilities.DoubleArray{Encoding: map[string]int{"edge": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
-)
+var filter_Edit_AddEdge_0 = &utilities.DoubleArray{Encoding: map[string]int{"edge": 0, "graph": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
 
 func request_Edit_AddEdge_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphElement
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphElement
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddEdge_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := client.AddEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddEdge_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphElement
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphElement
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq.Edge); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	if err := req.ParseForm(); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
 	if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Edit_AddEdge_0); err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := server.AddEdge(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_BulkAdd_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
@@ -1037,7 +773,7 @@ func request_Edit_BulkAdd_0(ctx context.Context, marshaler runtime.Marshaler, cl
 	for {
 		var protoReq GraphElement
 		err = dec.Decode(&protoReq)
-		if err == io.EOF {
+		if errors.Is(err, io.EOF) {
 			break
 		}
 		if err != nil {
@@ -1045,14 +781,13 @@ func request_Edit_BulkAdd_0(ctx context.Context, marshaler runtime.Marshaler, cl
 			return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 		}
 		if err = stream.Send(&protoReq); err != nil {
-			if err == io.EOF {
+			if errors.Is(err, io.EOF) {
 				break
 			}
 			grpclog.Errorf("Failed to send request: %v", err)
 			return nil, metadata, err
 		}
 	}
-
 	if err := stream.CloseSend(); err != nil {
 		grpclog.Errorf("Failed to terminate client stream: %v", err)
 		return nil, metadata, err
@@ -1063,725 +798,616 @@ func request_Edit_BulkAdd_0(ctx context.Context, marshaler runtime.Marshaler, cl
 		return nil, metadata, err
 	}
 	metadata.HeaderMD = header
-
 	msg, err := stream.CloseAndRecv()
 	metadata.TrailerMD = stream.Trailer()
 	return msg, metadata, err
-
 }
 
-func request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
+func request_Edit_BulkAddRaw_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var metadata runtime.ServerMetadata
+	stream, err := client.BulkAddRaw(ctx)
+	if err != nil {
+		grpclog.Errorf("Failed to start streaming: %v", err)
+		return nil, metadata, err
+	}
+	dec := marshaler.NewDecoder(req.Body)
+	for {
+		var protoReq RawJson
+		err = dec.Decode(&protoReq)
+		if errors.Is(err, io.EOF) {
+			break
+		}
+		if err != nil {
+			grpclog.Errorf("Failed to decode request: %v", err)
+			return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+		}
+		if err = stream.Send(&protoReq); err != nil {
+			if errors.Is(err, io.EOF) {
+				break
+			}
+			grpclog.Errorf("Failed to send request: %v", err)
+			return nil, metadata, err
+		}
+	}
+	if err := stream.CloseSend(); err != nil {
+		grpclog.Errorf("Failed to terminate client stream: %v", err)
+		return nil, metadata, err
+	}
+	header, err := stream.Header()
+	if err != nil {
+		grpclog.Errorf("Failed to get header from client: %v", err)
+		return nil, metadata, err
+	}
+	metadata.HeaderMD = header
+	msg, err := stream.CloseAndRecv()
+	metadata.TrailerMD = stream.Trailer()
+	return msg, metadata, err
+}
 
+func request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.AddGraph(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddGraph_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.AddGraph(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_DeleteGraph_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.DeleteGraph(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_DeleteGraph_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.DeleteGraph(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_BulkDelete_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq DeleteData
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+	var (
+		protoReq DeleteData
+		metadata runtime.ServerMetadata
+	)
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := client.BulkDelete(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_BulkDelete_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq DeleteData
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+	var (
+		protoReq DeleteData
+		metadata runtime.ServerMetadata
+	)
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
-
 	msg, err := server.BulkDelete(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_DeleteVertex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.DeleteVertex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_DeleteVertex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.DeleteVertex(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_DeleteEdge_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := client.DeleteEdge(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_DeleteEdge_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq ElementID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq ElementID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["id"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "id")
 	}
-
 	protoReq.Id, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err)
 	}
-
 	msg, err := server.DeleteEdge(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_AddIndex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq IndexID
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq IndexID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["label"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label")
 	}
-
 	protoReq.Label, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err)
 	}
-
 	msg, err := client.AddIndex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddIndex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq IndexID
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq IndexID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["label"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label")
 	}
-
 	protoReq.Label, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err)
 	}
-
 	msg, err := server.AddIndex(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_DeleteIndex_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq IndexID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq IndexID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["label"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label")
 	}
-
 	protoReq.Label, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err)
 	}
-
 	val, ok = pathParams["field"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "field")
 	}
-
 	protoReq.Field, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "field", err)
 	}
-
 	msg, err := client.DeleteIndex(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_DeleteIndex_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq IndexID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq IndexID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	val, ok = pathParams["label"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "label")
 	}
-
 	protoReq.Label, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "label", err)
 	}
-
 	val, ok = pathParams["field"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "field")
 	}
-
 	protoReq.Field, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "field", err)
 	}
-
 	msg, err := server.DeleteIndex(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_AddSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Graph
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq Graph
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.AddSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Graph
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
+	var (
+		protoReq Graph
+		metadata runtime.ServerMetadata
+		err      error
+	)
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
 	}
+	val, ok := pathParams["graph"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
+	}
+	protoReq.Graph, err = runtime.String(val)
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
+	}
+	msg, err := server.AddSchema(ctx, &protoReq)
+	return msg, metadata, err
+}
 
+func request_Edit_AddJsonSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq RawJson
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
-	msg, err := server.AddSchema(ctx, &protoReq)
+	msg, err := client.AddJsonSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
+}
 
+func local_request_Edit_AddJsonSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+	var (
+		protoReq RawJson
+		metadata runtime.ServerMetadata
+		err      error
+	)
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
+	}
+	protoReq.Graph, err = runtime.String(val)
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
+	}
+	msg, err := server.AddJsonSchema(ctx, &protoReq)
+	return msg, metadata, err
 }
 
 func request_Edit_SampleSchema_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.SampleSchema(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_SampleSchema_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq GraphID
-	var metadata runtime.ServerMetadata
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq GraphID
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.SampleSchema(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Edit_AddMapping_0(ctx context.Context, marshaler runtime.Marshaler, client EditClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Graph
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq Graph
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := client.AddMapping(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Edit_AddMapping_0(ctx context.Context, marshaler runtime.Marshaler, server EditServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Graph
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq Graph
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["graph"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["graph"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "graph")
 	}
-
 	protoReq.Graph, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "graph", err)
 	}
-
 	msg, err := server.AddMapping(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Configure_StartPlugin_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq PluginConfig
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq PluginConfig
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["name"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["name"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
-
 	protoReq.Name, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
-
 	msg, err := client.StartPlugin(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Configure_StartPlugin_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq PluginConfig
-	var metadata runtime.ServerMetadata
-
-	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
-	}
-
 	var (
-		val string
-		ok  bool
-		err error
-		_   = err
+		protoReq PluginConfig
+		metadata runtime.ServerMetadata
+		err      error
 	)
-
-	val, ok = pathParams["name"]
+	if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && !errors.Is(err, io.EOF) {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	}
+	val, ok := pathParams["name"]
 	if !ok {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "name")
 	}
-
 	protoReq.Name, err = runtime.String(val)
 	if err != nil {
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "name", err)
 	}
-
 	msg, err := server.StartPlugin(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Configure_ListPlugins_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := client.ListPlugins(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Configure_ListPlugins_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := server.ListPlugins(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 func request_Configure_ListDrivers_0(ctx context.Context, marshaler runtime.Marshaler, client ConfigureClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := client.ListDrivers(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
 	return msg, metadata, err
-
 }
 
 func local_request_Configure_ListDrivers_0(ctx context.Context, marshaler runtime.Marshaler, server ConfigureServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-	var protoReq Empty
-	var metadata runtime.ServerMetadata
-
+	var (
+		protoReq Empty
+		metadata runtime.ServerMetadata
+	)
 	msg, err := server.ListDrivers(ctx, &protoReq)
 	return msg, metadata, err
-
 }
 
 // RegisterQueryHandlerServer registers the http handlers for service Query to "mux".
@@ -1790,23 +1416,19 @@ func local_request_Configure_ListDrivers_0(ctx context.Context, marshaler runtim
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterQueryHandlerFromEndpoint instead.
 // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.
 func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, server QueryServer) error {
-
-	mux.Handle("POST", pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 		return
 	})
-
-	mux.Handle("GET", pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1818,20 +1440,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1843,20 +1460,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1868,20 +1480,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetTimestamp_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1893,20 +1500,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1918,20 +1520,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1943,20 +1540,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListGraphs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1968,20 +1560,15 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListIndices_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -1993,12 +1580,10 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListLabels_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
-	mux.Handle("GET", pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -2014,16 +1599,13 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterJobHandlerFromEndpoint instead.
 // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.
 func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server JobServer) error {
-
-	mux.Handle("POST", pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2035,34 +1617,29 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_Submit_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
-	mux.Handle("GET", pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 		return
 	})
 
-	mux.Handle("POST", pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 		return
 	})
-
-	mux.Handle("DELETE", pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2074,20 +1651,15 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_DeleteJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2099,19 +1671,17 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_GetJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
-	mux.Handle("POST", pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 		return
 	})
 
-	mux.Handle("POST", pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
@@ -2127,16 +1697,13 @@ func RegisterJobHandlerServer(ctx context.Context, mux *runtime.ServeMux, server
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterEditHandlerFromEndpoint instead.
 // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.
 func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, server EditServer) error {
-
-	mux.Handle("POST", pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2148,20 +1715,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2173,27 +1735,29 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
-	mux.Handle("POST", pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
 		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
 		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 		return
 	})
 
-	mux.Handle("POST", pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_BulkAddRaw_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		err := status.Error(codes.Unimplemented, "streaming calls are not yet supported in the in-process transport")
+		_, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+		return
+	})
+	mux.Handle(http.MethodPost, pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2205,20 +1769,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2230,20 +1789,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2255,20 +1809,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_BulkDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2280,20 +1829,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2305,20 +1849,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2330,20 +1869,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2355,20 +1889,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2380,20 +1909,35 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddJsonSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		var stream runtime.ServerTransportStream
+		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddJsonSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/jsonschema"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := local_request_Edit_AddJsonSchema_0(annotatedContext, inboundMarshaler, server, req, pathParams)
+		md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer())
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		forward_Edit_AddJsonSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+	})
+	mux.Handle(http.MethodGet, pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2405,20 +1949,15 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_SampleSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2430,9 +1969,7 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
 	return nil
@@ -2444,16 +1981,13 @@ func RegisterEditHandlerServer(ctx context.Context, mux *runtime.ServeMux, serve
 // Note that using this registration option will cause many gRPC library features to stop working. Consider using RegisterConfigureHandlerFromEndpoint instead.
 // GRPC interceptors will not work for this type of registration. To use interceptors, you must use the "runtime.WithMiddlewares" option in the "runtime.NewServeMux" call.
 func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux, server ConfigureServer) error {
-
-	mux.Handle("POST", pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2465,20 +1999,15 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_StartPlugin_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2490,20 +2019,15 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_ListPlugins_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		var stream runtime.ServerTransportStream
 		ctx = grpc.NewContextWithServerTransportStream(ctx, &stream)
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver"))
+		annotatedContext, err := runtime.AnnotateIncomingContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2515,9 +2039,7 @@ func RegisterConfigureHandlerServer(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_ListDrivers_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
 
 	return nil
@@ -2544,7 +2066,6 @@ func RegisterQueryHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux
 			}
 		}()
 	}()
-
 	return RegisterQueryHandler(ctx, mux, conn)
 }
 
@@ -2560,14 +2081,11 @@ func RegisterQueryHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "QueryClient" to call the correct interceptors. This client ignores the HTTP middlewares.
 func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, client QueryClient) error {
-
-	mux.Handle("POST", pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Query_Traversal_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/Traversal", runtime.WithHTTPPathPattern("/v1/graph/{graph}/query"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/Traversal", runtime.WithHTTPPathPattern("/v1/graph/{graph}/query"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2578,18 +2096,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_Traversal_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2600,18 +2113,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2622,18 +2130,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetTimestamp_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetTimestamp", runtime.WithHTTPPathPattern("/v1/graph/{graph}/timestamp"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2644,18 +2147,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetTimestamp_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2666,18 +2164,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_GetMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/GetMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2688,18 +2181,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_GetMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListGraphs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListGraphs", runtime.WithHTTPPathPattern("/v1/graph"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2710,18 +2198,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListGraphs_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListIndices_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListIndices", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2732,18 +2215,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListIndices_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListLabels_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListLabels", runtime.WithHTTPPathPattern("/v1/graph/{graph}/label"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2754,18 +2232,13 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListLabels_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Query_ListTables_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListTables", runtime.WithHTTPPathPattern("/v1/table"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Query/ListTables", runtime.WithHTTPPathPattern("/v1/table"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2776,56 +2249,35 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Query_ListTables_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
 	return nil
 }
 
 var (
-	pattern_Query_Traversal_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "query"}, ""))
-
-	pattern_Query_GetVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, ""))
-
-	pattern_Query_GetEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, ""))
-
+	pattern_Query_Traversal_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "query"}, ""))
+	pattern_Query_GetVertex_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, ""))
+	pattern_Query_GetEdge_0      = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, ""))
 	pattern_Query_GetTimestamp_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "timestamp"}, ""))
-
-	pattern_Query_GetSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, ""))
-
-	pattern_Query_GetMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, ""))
-
-	pattern_Query_ListGraphs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
-
-	pattern_Query_ListIndices_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "index"}, ""))
-
-	pattern_Query_ListLabels_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "label"}, ""))
-
-	pattern_Query_ListTables_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "table"}, ""))
+	pattern_Query_GetSchema_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, ""))
+	pattern_Query_GetMapping_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, ""))
+	pattern_Query_ListGraphs_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
+	pattern_Query_ListIndices_0  = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "index"}, ""))
+	pattern_Query_ListLabels_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "label"}, ""))
+	pattern_Query_ListTables_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "table"}, ""))
 )
 
 var (
-	forward_Query_Traversal_0 = runtime.ForwardResponseStream
-
-	forward_Query_GetVertex_0 = runtime.ForwardResponseMessage
-
-	forward_Query_GetEdge_0 = runtime.ForwardResponseMessage
-
+	forward_Query_Traversal_0    = runtime.ForwardResponseStream
+	forward_Query_GetVertex_0    = runtime.ForwardResponseMessage
+	forward_Query_GetEdge_0      = runtime.ForwardResponseMessage
 	forward_Query_GetTimestamp_0 = runtime.ForwardResponseMessage
-
-	forward_Query_GetSchema_0 = runtime.ForwardResponseMessage
-
-	forward_Query_GetMapping_0 = runtime.ForwardResponseMessage
-
-	forward_Query_ListGraphs_0 = runtime.ForwardResponseMessage
-
-	forward_Query_ListIndices_0 = runtime.ForwardResponseMessage
-
-	forward_Query_ListLabels_0 = runtime.ForwardResponseMessage
-
-	forward_Query_ListTables_0 = runtime.ForwardResponseStream
+	forward_Query_GetSchema_0    = runtime.ForwardResponseMessage
+	forward_Query_GetMapping_0   = runtime.ForwardResponseMessage
+	forward_Query_ListGraphs_0   = runtime.ForwardResponseMessage
+	forward_Query_ListIndices_0  = runtime.ForwardResponseMessage
+	forward_Query_ListLabels_0   = runtime.ForwardResponseMessage
+	forward_Query_ListTables_0   = runtime.ForwardResponseStream
 )
 
 // RegisterJobHandlerFromEndpoint is same as RegisterJobHandler but
@@ -2849,7 +2301,6 @@ func RegisterJobHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux,
 			}
 		}()
 	}()
-
 	return RegisterJobHandler(ctx, mux, conn)
 }
 
@@ -2865,14 +2316,11 @@ func RegisterJobHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.C
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "JobClient" to call the correct interceptors. This client ignores the HTTP middlewares.
 func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client JobClient) error {
-
-	mux.Handle("POST", pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_Submit_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/Submit", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2883,18 +2331,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_Submit_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Job_ListJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ListJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ListJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2905,18 +2348,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_ListJobs_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_SearchJobs_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/SearchJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-search"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/SearchJobs", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-search"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2927,18 +2365,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_SearchJobs_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Job_DeleteJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/DeleteJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2949,18 +2382,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_DeleteJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Job_GetJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/GetJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2971,18 +2399,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_GetJob_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_ViewJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ViewJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ViewJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -2993,18 +2416,13 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_ViewJob_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Job_ResumeJob_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ResumeJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-resume"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Job/ResumeJob", runtime.WithHTTPPathPattern("/v1/graph/{graph}/job-resume"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3015,44 +2433,29 @@ func RegisterJobHandlerClient(ctx context.Context, mux *runtime.ServeMux, client
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Job_ResumeJob_0(annotatedContext, mux, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
-
 	})
-
 	return nil
 }
 
 var (
-	pattern_Job_Submit_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, ""))
-
-	pattern_Job_ListJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, ""))
-
+	pattern_Job_Submit_0     = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, ""))
+	pattern_Job_ListJobs_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job"}, ""))
 	pattern_Job_SearchJobs_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-search"}, ""))
-
-	pattern_Job_DeleteJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
-
-	pattern_Job_GetJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
-
-	pattern_Job_ViewJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
-
-	pattern_Job_ResumeJob_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-resume"}, ""))
+	pattern_Job_DeleteJob_0  = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
+	pattern_Job_GetJob_0     = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
+	pattern_Job_ViewJob_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "job", "id"}, ""))
+	pattern_Job_ResumeJob_0  = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "job-resume"}, ""))
 )
 
 var (
-	forward_Job_Submit_0 = runtime.ForwardResponseMessage
-
-	forward_Job_ListJobs_0 = runtime.ForwardResponseStream
-
+	forward_Job_Submit_0     = runtime.ForwardResponseMessage
+	forward_Job_ListJobs_0   = runtime.ForwardResponseStream
 	forward_Job_SearchJobs_0 = runtime.ForwardResponseStream
-
-	forward_Job_DeleteJob_0 = runtime.ForwardResponseMessage
-
-	forward_Job_GetJob_0 = runtime.ForwardResponseMessage
-
-	forward_Job_ViewJob_0 = runtime.ForwardResponseStream
-
-	forward_Job_ResumeJob_0 = runtime.ForwardResponseStream
+	forward_Job_DeleteJob_0  = runtime.ForwardResponseMessage
+	forward_Job_GetJob_0     = runtime.ForwardResponseMessage
+	forward_Job_ViewJob_0    = runtime.ForwardResponseStream
+	forward_Job_ResumeJob_0  = runtime.ForwardResponseStream
 )
 
 // RegisterEditHandlerFromEndpoint is same as RegisterEditHandler but
@@ -3076,7 +2479,6 @@ func RegisterEditHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux,
 			}
 		}()
 	}()
-
 	return RegisterEditHandler(ctx, mux, conn)
 }
 
@@ -3092,14 +2494,11 @@ func RegisterEditHandler(ctx context.Context, mux *runtime.ServeMux, conn *grpc.
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "EditClient" to call the correct interceptors. This client ignores the HTTP middlewares.
 func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, client EditClient) error {
-
-	mux.Handle("POST", pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3110,18 +2509,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3132,18 +2526,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_BulkAdd_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAdd", runtime.WithHTTPPathPattern("/v1/graph"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAdd", runtime.WithHTTPPathPattern("/v1/graph"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3154,18 +2543,30 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_BulkAdd_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_BulkAddRaw_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkAddRaw", runtime.WithHTTPPathPattern("/v1/rawJson"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Edit_BulkAddRaw_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		forward_Edit_BulkAddRaw_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+	})
+	mux.Handle(http.MethodPost, pattern_Edit_AddGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3176,18 +2577,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteGraph_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteGraph", runtime.WithHTTPPathPattern("/v1/graph/{graph}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3198,18 +2594,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteGraph_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_BulkDelete_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/BulkDelete", runtime.WithHTTPPathPattern("/v1/graph"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3220,18 +2611,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_BulkDelete_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteVertex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteVertex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/vertex/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3242,18 +2628,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteVertex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteEdge_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteEdge", runtime.WithHTTPPathPattern("/v1/graph/{graph}/edge/{id}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3264,18 +2645,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteEdge_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3286,18 +2662,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("DELETE", pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodDelete, pattern_Edit_DeleteIndex_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/DeleteIndex", runtime.WithHTTPPathPattern("/v1/graph/{graph}/index/{label}/{field}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3308,18 +2679,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_DeleteIndex_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3330,18 +2696,30 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddJsonSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+		ctx, cancel := context.WithCancel(req.Context())
+		defer cancel()
+		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddJsonSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/jsonschema"))
+		if err != nil {
+			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		resp, md, err := request_Edit_AddJsonSchema_0(annotatedContext, inboundMarshaler, client, req, pathParams)
+		annotatedContext = runtime.NewServerMetadataContext(annotatedContext, md)
+		if err != nil {
+			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
+			return
+		}
+		forward_Edit_AddJsonSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+	})
+	mux.Handle(http.MethodGet, pattern_Edit_SampleSchema_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/SampleSchema", runtime.WithHTTPPathPattern("/v1/graph/{graph}/schema-sample"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3352,18 +2730,13 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_SampleSchema_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("POST", pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Edit_AddMapping_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Edit/AddMapping", runtime.WithHTTPPathPattern("/v1/graph/{graph}/mapping"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3374,68 +2747,45 @@ func RegisterEditHandlerClient(ctx context.Context, mux *runtime.ServeMux, clien
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Edit_AddMapping_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
 	return nil
 }
 
 var (
-	pattern_Edit_AddVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "vertex"}, ""))
-
-	pattern_Edit_AddEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "edge"}, ""))
-
-	pattern_Edit_BulkAdd_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
-
-	pattern_Edit_AddGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, ""))
-
-	pattern_Edit_DeleteGraph_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, ""))
-
-	pattern_Edit_BulkDelete_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
-
-	pattern_Edit_DeleteVertex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, ""))
-
-	pattern_Edit_DeleteEdge_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, ""))
-
-	pattern_Edit_AddIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "index", "label"}, ""))
-
-	pattern_Edit_DeleteIndex_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"v1", "graph", "index", "label", "field"}, ""))
-
-	pattern_Edit_AddSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, ""))
-
-	pattern_Edit_SampleSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema-sample"}, ""))
-
-	pattern_Edit_AddMapping_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, ""))
+	pattern_Edit_AddVertex_0     = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "vertex"}, ""))
+	pattern_Edit_AddEdge_0       = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "edge"}, ""))
+	pattern_Edit_BulkAdd_0       = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
+	pattern_Edit_BulkAddRaw_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "rawJson"}, ""))
+	pattern_Edit_AddGraph_0      = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, ""))
+	pattern_Edit_DeleteGraph_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1}, []string{"v1", "graph"}, ""))
+	pattern_Edit_BulkDelete_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "graph"}, ""))
+	pattern_Edit_DeleteVertex_0  = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "vertex", "id"}, ""))
+	pattern_Edit_DeleteEdge_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "edge", "id"}, ""))
+	pattern_Edit_AddIndex_0      = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"v1", "graph", "index", "label"}, ""))
+	pattern_Edit_DeleteIndex_0   = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"v1", "graph", "index", "label", "field"}, ""))
+	pattern_Edit_AddSchema_0     = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema"}, ""))
+	pattern_Edit_AddJsonSchema_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "jsonschema"}, ""))
+	pattern_Edit_SampleSchema_0  = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "schema-sample"}, ""))
+	pattern_Edit_AddMapping_0    = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 1, 2, 2}, []string{"v1", "graph", "mapping"}, ""))
 )
 
 var (
-	forward_Edit_AddVertex_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_AddEdge_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_BulkAdd_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_AddGraph_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_DeleteGraph_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_BulkDelete_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_DeleteVertex_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_DeleteEdge_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_AddIndex_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_DeleteIndex_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_AddSchema_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_SampleSchema_0 = runtime.ForwardResponseMessage
-
-	forward_Edit_AddMapping_0 = runtime.ForwardResponseMessage
+	forward_Edit_AddVertex_0     = runtime.ForwardResponseMessage
+	forward_Edit_AddEdge_0       = runtime.ForwardResponseMessage
+	forward_Edit_BulkAdd_0       = runtime.ForwardResponseMessage
+	forward_Edit_BulkAddRaw_0    = runtime.ForwardResponseMessage
+	forward_Edit_AddGraph_0      = runtime.ForwardResponseMessage
+	forward_Edit_DeleteGraph_0   = runtime.ForwardResponseMessage
+	forward_Edit_BulkDelete_0    = runtime.ForwardResponseMessage
+	forward_Edit_DeleteVertex_0  = runtime.ForwardResponseMessage
+	forward_Edit_DeleteEdge_0    = runtime.ForwardResponseMessage
+	forward_Edit_AddIndex_0      = runtime.ForwardResponseMessage
+	forward_Edit_DeleteIndex_0   = runtime.ForwardResponseMessage
+	forward_Edit_AddSchema_0     = runtime.ForwardResponseMessage
+	forward_Edit_AddJsonSchema_0 = runtime.ForwardResponseMessage
+	forward_Edit_SampleSchema_0  = runtime.ForwardResponseMessage
+	forward_Edit_AddMapping_0    = runtime.ForwardResponseMessage
 )
 
 // RegisterConfigureHandlerFromEndpoint is same as RegisterConfigureHandler but
@@ -3459,7 +2809,6 @@ func RegisterConfigureHandlerFromEndpoint(ctx context.Context, mux *runtime.Serv
 			}
 		}()
 	}()
-
 	return RegisterConfigureHandler(ctx, mux, conn)
 }
 
@@ -3475,14 +2824,11 @@ func RegisterConfigureHandler(ctx context.Context, mux *runtime.ServeMux, conn *
 // doesn't go through the normal gRPC flow (creating a gRPC client etc.) then it will be up to the passed in
 // "ConfigureClient" to call the correct interceptors. This client ignores the HTTP middlewares.
 func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux, client ConfigureClient) error {
-
-	mux.Handle("POST", pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodPost, pattern_Configure_StartPlugin_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/StartPlugin", runtime.WithHTTPPathPattern("/v1/plugin/{name}"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3493,18 +2839,13 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_StartPlugin_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Configure_ListPlugins_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListPlugins", runtime.WithHTTPPathPattern("/v1/plugin"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3515,18 +2856,13 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_ListPlugins_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
-	mux.Handle("GET", pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
+	mux.Handle(http.MethodGet, pattern_Configure_ListDrivers_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) {
 		ctx, cancel := context.WithCancel(req.Context())
 		defer cancel()
 		inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req)
-		var err error
-		var annotatedContext context.Context
-		annotatedContext, err = runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver"))
+		annotatedContext, err := runtime.AnnotateContext(ctx, mux, req, "/gripql.Configure/ListDrivers", runtime.WithHTTPPathPattern("/v1/driver"))
 		if err != nil {
 			runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err)
 			return
@@ -3537,26 +2873,19 @@ func RegisterConfigureHandlerClient(ctx context.Context, mux *runtime.ServeMux,
 			runtime.HTTPError(annotatedContext, mux, outboundMarshaler, w, req, err)
 			return
 		}
-
 		forward_Configure_ListDrivers_0(annotatedContext, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
-
 	})
-
 	return nil
 }
 
 var (
 	pattern_Configure_StartPlugin_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 1, 0, 4, 1, 5, 2}, []string{"v1", "plugin", "name"}, ""))
-
 	pattern_Configure_ListPlugins_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "plugin"}, ""))
-
 	pattern_Configure_ListDrivers_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1}, []string{"v1", "driver"}, ""))
 )
 
 var (
 	forward_Configure_StartPlugin_0 = runtime.ForwardResponseMessage
-
 	forward_Configure_ListPlugins_0 = runtime.ForwardResponseMessage
-
 	forward_Configure_ListDrivers_0 = runtime.ForwardResponseMessage
 )
diff --git a/gripql/gripql.proto b/gripql/gripql.proto
index 7845e162..05808b14 100644
--- a/gripql/gripql.proto
+++ b/gripql/gripql.proto
@@ -245,6 +245,11 @@ message BulkEditResult {
   int32 error_count = 2;
 }
 
+message BulkJsonEditResult{
+    int32 insert_count = 1;
+    repeated string errors = 2;
+}
+
 message GraphElement {
   string graph = 1;
   Vertex vertex = 2;
@@ -307,6 +312,12 @@ message DeleteData {
   repeated string edges = 3;
 }
 
+message RawJson {
+  string graph = 1;
+  google.protobuf.Struct extra_args = 2;
+  google.protobuf.Struct data = 3;
+}
+
 service Query {
   rpc Traversal(GraphQuery) returns (stream QueryResult) {
     option (google.api.http) = {
@@ -440,6 +451,12 @@ service Edit {
     };
   }
 
+  rpc BulkAddRaw (stream RawJson) returns (BulkJsonEditResult) {
+    option (google.api.http) = {
+      post: "/v1/rawJson"
+    };
+  }
+
   rpc AddGraph(GraphID) returns (EditResult) {
     option (google.api.http) = {
       post: "/v1/graph/{graph}"
@@ -491,13 +508,20 @@ service Edit {
     };
   }
 
-     rpc SampleSchema(GraphID) returns (Graph) {
+  rpc AddJsonSchema(RawJson) returns (EditResult) {
+    option (google.api.http) = {
+        post: "/v1/graph/{graph}/jsonschema"
+        body: "*"
+    };
+  }
+
+  rpc SampleSchema(GraphID) returns (Graph) {
     option (google.api.http) = {
       get: "/v1/graph/{graph}/schema-sample"
     };
   }
 
-     rpc AddMapping(Graph) returns (EditResult) {
+  rpc AddMapping(Graph) returns (EditResult) {
     option (google.api.http) = {
       post: "/v1/graph/{graph}/mapping"
       body: "*"
diff --git a/gripql/gripql_grpc.pb.go b/gripql/gripql_grpc.pb.go
index ef146e6e..f8528190 100644
--- a/gripql/gripql_grpc.pb.go
+++ b/gripql/gripql_grpc.pb.go
@@ -935,19 +935,21 @@ var Job_ServiceDesc = grpc.ServiceDesc{
 }
 
 const (
-	Edit_AddVertex_FullMethodName    = "/gripql.Edit/AddVertex"
-	Edit_AddEdge_FullMethodName      = "/gripql.Edit/AddEdge"
-	Edit_BulkAdd_FullMethodName      = "/gripql.Edit/BulkAdd"
-	Edit_AddGraph_FullMethodName     = "/gripql.Edit/AddGraph"
-	Edit_DeleteGraph_FullMethodName  = "/gripql.Edit/DeleteGraph"
-	Edit_BulkDelete_FullMethodName   = "/gripql.Edit/BulkDelete"
-	Edit_DeleteVertex_FullMethodName = "/gripql.Edit/DeleteVertex"
-	Edit_DeleteEdge_FullMethodName   = "/gripql.Edit/DeleteEdge"
-	Edit_AddIndex_FullMethodName     = "/gripql.Edit/AddIndex"
-	Edit_DeleteIndex_FullMethodName  = "/gripql.Edit/DeleteIndex"
-	Edit_AddSchema_FullMethodName    = "/gripql.Edit/AddSchema"
-	Edit_SampleSchema_FullMethodName = "/gripql.Edit/SampleSchema"
-	Edit_AddMapping_FullMethodName   = "/gripql.Edit/AddMapping"
+	Edit_AddVertex_FullMethodName     = "/gripql.Edit/AddVertex"
+	Edit_AddEdge_FullMethodName       = "/gripql.Edit/AddEdge"
+	Edit_BulkAdd_FullMethodName       = "/gripql.Edit/BulkAdd"
+	Edit_BulkAddRaw_FullMethodName    = "/gripql.Edit/BulkAddRaw"
+	Edit_AddGraph_FullMethodName      = "/gripql.Edit/AddGraph"
+	Edit_DeleteGraph_FullMethodName   = "/gripql.Edit/DeleteGraph"
+	Edit_BulkDelete_FullMethodName    = "/gripql.Edit/BulkDelete"
+	Edit_DeleteVertex_FullMethodName  = "/gripql.Edit/DeleteVertex"
+	Edit_DeleteEdge_FullMethodName    = "/gripql.Edit/DeleteEdge"
+	Edit_AddIndex_FullMethodName      = "/gripql.Edit/AddIndex"
+	Edit_DeleteIndex_FullMethodName   = "/gripql.Edit/DeleteIndex"
+	Edit_AddSchema_FullMethodName     = "/gripql.Edit/AddSchema"
+	Edit_AddJsonSchema_FullMethodName = "/gripql.Edit/AddJsonSchema"
+	Edit_SampleSchema_FullMethodName  = "/gripql.Edit/SampleSchema"
+	Edit_AddMapping_FullMethodName    = "/gripql.Edit/AddMapping"
 )
 
 // EditClient is the client API for Edit service.
@@ -957,6 +959,7 @@ type EditClient interface {
 	AddVertex(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error)
 	AddEdge(ctx context.Context, in *GraphElement, opts ...grpc.CallOption) (*EditResult, error)
 	BulkAdd(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddClient, error)
+	BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddRawClient, error)
 	AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error)
 	DeleteGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error)
 	BulkDelete(ctx context.Context, in *DeleteData, opts ...grpc.CallOption) (*EditResult, error)
@@ -965,6 +968,7 @@ type EditClient interface {
 	AddIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error)
 	DeleteIndex(ctx context.Context, in *IndexID, opts ...grpc.CallOption) (*EditResult, error)
 	AddSchema(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error)
+	AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error)
 	SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error)
 	AddMapping(ctx context.Context, in *Graph, opts ...grpc.CallOption) (*EditResult, error)
 }
@@ -1032,6 +1036,41 @@ func (x *editBulkAddClient) CloseAndRecv() (*BulkEditResult, error) {
 	return m, nil
 }
 
+func (c *editClient) BulkAddRaw(ctx context.Context, opts ...grpc.CallOption) (Edit_BulkAddRawClient, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &Edit_ServiceDesc.Streams[1], Edit_BulkAddRaw_FullMethodName, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &editBulkAddRawClient{ClientStream: stream}
+	return x, nil
+}
+
+type Edit_BulkAddRawClient interface {
+	Send(*RawJson) error
+	CloseAndRecv() (*BulkJsonEditResult, error)
+	grpc.ClientStream
+}
+
+type editBulkAddRawClient struct {
+	grpc.ClientStream
+}
+
+func (x *editBulkAddRawClient) Send(m *RawJson) error {
+	return x.ClientStream.SendMsg(m)
+}
+
+func (x *editBulkAddRawClient) CloseAndRecv() (*BulkJsonEditResult, error) {
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	m := new(BulkJsonEditResult)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 func (c *editClient) AddGraph(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*EditResult, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(EditResult)
@@ -1112,6 +1151,16 @@ func (c *editClient) AddSchema(ctx context.Context, in *Graph, opts ...grpc.Call
 	return out, nil
 }
 
+func (c *editClient) AddJsonSchema(ctx context.Context, in *RawJson, opts ...grpc.CallOption) (*EditResult, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(EditResult)
+	err := c.cc.Invoke(ctx, Edit_AddJsonSchema_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (c *editClient) SampleSchema(ctx context.Context, in *GraphID, opts ...grpc.CallOption) (*Graph, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(Graph)
@@ -1139,6 +1188,7 @@ type EditServer interface {
 	AddVertex(context.Context, *GraphElement) (*EditResult, error)
 	AddEdge(context.Context, *GraphElement) (*EditResult, error)
 	BulkAdd(Edit_BulkAddServer) error
+	BulkAddRaw(Edit_BulkAddRawServer) error
 	AddGraph(context.Context, *GraphID) (*EditResult, error)
 	DeleteGraph(context.Context, *GraphID) (*EditResult, error)
 	BulkDelete(context.Context, *DeleteData) (*EditResult, error)
@@ -1147,6 +1197,7 @@ type EditServer interface {
 	AddIndex(context.Context, *IndexID) (*EditResult, error)
 	DeleteIndex(context.Context, *IndexID) (*EditResult, error)
 	AddSchema(context.Context, *Graph) (*EditResult, error)
+	AddJsonSchema(context.Context, *RawJson) (*EditResult, error)
 	SampleSchema(context.Context, *GraphID) (*Graph, error)
 	AddMapping(context.Context, *Graph) (*EditResult, error)
 	mustEmbedUnimplementedEditServer()
@@ -1165,6 +1216,9 @@ func (UnimplementedEditServer) AddEdge(context.Context, *GraphElement) (*EditRes
 func (UnimplementedEditServer) BulkAdd(Edit_BulkAddServer) error {
 	return status.Errorf(codes.Unimplemented, "method BulkAdd not implemented")
 }
+func (UnimplementedEditServer) BulkAddRaw(Edit_BulkAddRawServer) error {
+	return status.Errorf(codes.Unimplemented, "method BulkAddRaw not implemented")
+}
 func (UnimplementedEditServer) AddGraph(context.Context, *GraphID) (*EditResult, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddGraph not implemented")
 }
@@ -1189,6 +1243,9 @@ func (UnimplementedEditServer) DeleteIndex(context.Context, *IndexID) (*EditResu
 func (UnimplementedEditServer) AddSchema(context.Context, *Graph) (*EditResult, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddSchema not implemented")
 }
+func (UnimplementedEditServer) AddJsonSchema(context.Context, *RawJson) (*EditResult, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method AddJsonSchema not implemented")
+}
 func (UnimplementedEditServer) SampleSchema(context.Context, *GraphID) (*Graph, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method SampleSchema not implemented")
 }
@@ -1270,6 +1327,32 @@ func (x *editBulkAddServer) Recv() (*GraphElement, error) {
 	return m, nil
 }
 
+func _Edit_BulkAddRaw_Handler(srv interface{}, stream grpc.ServerStream) error {
+	return srv.(EditServer).BulkAddRaw(&editBulkAddRawServer{ServerStream: stream})
+}
+
+type Edit_BulkAddRawServer interface {
+	SendAndClose(*BulkJsonEditResult) error
+	Recv() (*RawJson, error)
+	grpc.ServerStream
+}
+
+type editBulkAddRawServer struct {
+	grpc.ServerStream
+}
+
+func (x *editBulkAddRawServer) SendAndClose(m *BulkJsonEditResult) error {
+	return x.ServerStream.SendMsg(m)
+}
+
+func (x *editBulkAddRawServer) Recv() (*RawJson, error) {
+	m := new(RawJson)
+	if err := x.ServerStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
 func _Edit_AddGraph_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GraphID)
 	if err := dec(in); err != nil {
@@ -1414,6 +1497,24 @@ func _Edit_AddSchema_Handler(srv interface{}, ctx context.Context, dec func(inte
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Edit_AddJsonSchema_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(RawJson)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(EditServer).AddJsonSchema(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: Edit_AddJsonSchema_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(EditServer).AddJsonSchema(ctx, req.(*RawJson))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _Edit_SampleSchema_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GraphID)
 	if err := dec(in); err != nil {
@@ -1497,6 +1598,10 @@ var Edit_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "AddSchema",
 			Handler:    _Edit_AddSchema_Handler,
 		},
+		{
+			MethodName: "AddJsonSchema",
+			Handler:    _Edit_AddJsonSchema_Handler,
+		},
 		{
 			MethodName: "SampleSchema",
 			Handler:    _Edit_SampleSchema_Handler,
@@ -1512,6 +1617,11 @@ var Edit_ServiceDesc = grpc.ServiceDesc{
 			Handler:       _Edit_BulkAdd_Handler,
 			ClientStreams: true,
 		},
+		{
+			StreamName:    "BulkAddRaw",
+			Handler:       _Edit_BulkAddRaw_Handler,
+			ClientStreams: true,
+		},
 	},
 	Metadata: "gripql.proto",
 }
diff --git a/gripql/python/gripql/connection.py b/gripql/python/gripql/connection.py
index 6d7bb40d..4c4ed2f7 100644
--- a/gripql/python/gripql/connection.py
+++ b/gripql/python/gripql/connection.py
@@ -41,6 +41,20 @@ def deleteGraph(self, name):
         )
         raise_for_status(response)
         return response.json()
+    def addJsonSchema(self, fhirjson):
+        """
+        Add a Json Schema for a graph
+        """
+        payload = {
+            "graph": self.graph,
+            "data":fhirjson,
+        }
+        response = self.session.post(
+            self.url + "/jsonschema",
+            json=payload
+        )
+        raise_for_status(response)
+        return response.json()
 
     def getSchema(self, name):
         """
diff --git a/gripql/python/gripql/graph.py b/gripql/python/gripql/graph.py
index 2b64d02b..fe186a26 100644
--- a/gripql/python/gripql/graph.py
+++ b/gripql/python/gripql/graph.py
@@ -13,6 +13,21 @@ def __init__(self, url, graph, user=None, password=None, token=None, credential_
         self.url = self.base_url + "/v1/graph/" + graph
         self.graph = graph
 
+    def addJsonSchema(self, fhirjson):
+       """
+       Add a Json Schema for a graph
+       """
+       payload = {
+           "graph": self.graph,
+           "data":fhirjson,
+       }
+       response = self.session.post(
+           self.url + "/jsonschema",
+           json=payload
+       )
+       raise_for_status(response)
+       return response.json()
+
     def addSchema(self, vertices=[], edges=[]):
         """
         Add the schema for a graph.
@@ -147,6 +162,9 @@ def delete(self, vertices=[], edges=[]):
     def bulkAdd(self):
         return BulkAdd(self.base_url, self.graph, self.user, self.password, self.token)
 
+    def bulkAddRaw(self):
+        return BulkAddRaw(self.base_url, self.graph, self.user, self.password, self.token)
+
     def addIndex(self, label, field):
         url = self.url + "/index/" + label
         response = self.session.post(
@@ -300,3 +318,31 @@ def execute(self):
         )
         raise_for_status(response)
         return response.json()
+
+
+class BulkAddRaw(BaseConnection):
+    def __init__(self, url, graph, extraArgs=None, user=None, password=None, token=None, credential_file=None):
+        super(BulkAddRaw, self).__init__(url, user, password, token, credential_file)
+        self.url = self.base_url + "/v1/rawJson"
+        self.graph = graph
+        self.extraArgs = {"auth_resource_path": "test-data"}
+        self.elements = []
+
+
+    def addJson(self, data={}):
+        payload = {
+            "graph": self.graph,
+            "extra_args": self.extraArgs,
+            "data": data
+        }
+        self.elements.append(json.dumps(payload))
+
+
+    def execute(self):
+        payload = "\n".join(self.elements)
+        response = self.session.post(
+            self.url,
+            data=payload
+        )
+        raise_for_status(response)
+        return response.json()
diff --git a/gripql/query.go b/gripql/query.go
index 3f1cb6f2..dd99e420 100644
--- a/gripql/query.go
+++ b/gripql/query.go
@@ -199,6 +199,15 @@ func (q *Query) Aggregate(agg []*Aggregate) *Query {
 	return q.with(&GraphStatement{Statement: &GraphStatement_Aggregate{Aggregate: &Aggregations{Aggregations: agg}}})
 }
 
+func (q *Query) Pivot(id string, field string, value string) *Query {
+	return q.with(&GraphStatement{Statement: &GraphStatement_Pivot{Pivot: &PivotStep{Id: id, Field: field, Value: value}}})
+}
+
+// Deconstruct a vertex with an array of n fields as n vertices with no array, and a dict object instead
+func (q *Query) Unwind(path string) *Query {
+	return q.with(&GraphStatement{Statement: &GraphStatement_Unwind{Unwind: path}})
+}
+
 func (q *Query) String() string {
 	parts := []string{}
 	add := func(name string, x ...string) {
diff --git a/schema/graph.go b/schema/graph.go
new file mode 100644
index 00000000..1e1e2f93
--- /dev/null
+++ b/schema/graph.go
@@ -0,0 +1,381 @@
+package schema
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/bmeg/grip/log"
+
+	"github.com/bmeg/grip/gripql"
+	"google.golang.org/protobuf/encoding/protojson"
+	"sigs.k8s.io/yaml"
+)
+
+func ParseYAMLSchemaGraphs(source []byte, graphName string) ([]*gripql.Graph, error) {
+	return nil, nil
+}
+
+// ParseYAMLGraph parses a YAML doc into the given Graph instance.
+func ParseYAMLGraph(raw []byte) (*gripql.Graph, error) {
+	tmp := map[string]interface{}{}
+	err := yaml.Unmarshal(raw, &tmp)
+	if err != nil {
+		return nil, err
+	}
+	part, err := json.Marshal(tmp)
+	if err != nil {
+		return nil, err
+	}
+	g := &gripql.Graph{}
+	err = protojson.Unmarshal(part, g)
+	if err != nil {
+		return nil, err
+	}
+	return g, nil
+}
+
+func ParseYAMLGraphPath(relpath string) (*gripql.Graph, error) {
+	// Try to get absolute path. If it fails, fall back to relative path.
+	path, err := filepath.Abs(relpath)
+	if err != nil {
+		path = relpath
+	}
+	// Read file
+	source, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err)
+	}
+	return ParseYAMLGraph(source)
+}
+
+// ParseYAMLGraph parses a YAML doc into the given Graph instance.
+func ParseYAMLGraphs(raw []byte) ([]*gripql.Graph, error) {
+	graphs := []*gripql.Graph{}
+	tmp := []interface{}{}
+	err := yaml.Unmarshal(raw, &tmp)
+	if err != nil {
+		var tmp2 interface{}
+		err := yaml.Unmarshal(raw, &tmp2)
+		if err != nil {
+			return nil, err
+		}
+		tmp = append(tmp, tmp2)
+	}
+	for _, s := range tmp {
+		part, err := json.Marshal(s)
+		if err != nil {
+			return nil, err
+		}
+		g := &gripql.Graph{}
+		err = protojson.Unmarshal(part, g)
+		if err != nil {
+			return nil, err
+		}
+		if g.Graph == "" {
+			return nil, fmt.Errorf("missing graph name")
+		}
+		graphs = append(graphs, g)
+	}
+	return graphs, nil
+}
+
+// ParseJSONGraph parses a JSON doc into the given Graph instance.
+func ParseJSONGraphs(raw []byte) ([]*gripql.Graph, error) {
+	graphs := []*gripql.Graph{}
+	tmp := []interface{}{}
+	err := json.Unmarshal(raw, &tmp)
+	if err != nil {
+		var tmp2 interface{}
+		err := json.Unmarshal(raw, &tmp2)
+		if err != nil {
+			return nil, err
+		}
+		tmp = append(tmp, tmp2)
+	}
+	for _, s := range tmp {
+		part, err := json.Marshal(s)
+		if err != nil {
+			return nil, err
+		}
+		g := &gripql.Graph{}
+		err = protojson.Unmarshal(part, g)
+		if err != nil {
+			return nil, err
+		}
+		if g.Graph == "" {
+			return nil, fmt.Errorf("missing graph name")
+		}
+		graphs = append(graphs, g)
+	}
+	return graphs, nil
+}
+
+// ParseGraphYAMLFile parses a graph file, which is formatted in YAML,
+// and returns a slice of graph objects.
+func parseGraphFile(relpath string, format string, graphName string) ([]*gripql.Graph, error) {
+	var graphs []*gripql.Graph
+	var err error
+
+	if relpath == "" {
+		return nil, fmt.Errorf("path is empty")
+	}
+
+	// Try to get absolute path. If it fails, fall back to relative path.
+	path, err := filepath.Abs(relpath)
+	if err != nil {
+		path = relpath
+	}
+
+	var source []byte
+	if format == "yaml" || format == "json" {
+		source, err = ioutil.ReadFile(path)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read graph at path %s: \n%v", path, err)
+		}
+	}
+
+	// Parse file contents
+	switch format {
+	case "yaml":
+		graphs, err = ParseYAMLGraphs(source)
+	case "json":
+		graphs, err = ParseJSONGraphs(source)
+	case "ySchema":
+		// determine if file or directory
+		info, err := os.Stat(path)
+		if err != nil {
+			if os.IsNotExist(err) {
+				return nil, fmt.Errorf("path does not exist: %s", path)
+			}
+			return nil, fmt.Errorf("error accessing path: %v", err)
+		}
+		graphSchema := map[string]any{
+			"vertices": []map[string]any{},
+			"edges":    []map[string]any{}, // Optional: if there are no edges from YAML files
+			"graph":    graphName,
+		}
+		if info.IsDir() {
+			files, err := ioutil.ReadDir(path)
+			if err != nil {
+				return nil, fmt.Errorf("failed to read directory: %v", err)
+			}
+
+			for _, file := range files {
+				if file.IsDir() || filepath.Ext(file.Name()) != ".yaml" && filepath.Ext(file.Name()) != ".yml" {
+					continue
+				}
+				filePath := filepath.Join(path, file.Name())
+				content, err := ioutil.ReadFile(filePath)
+				if err != nil {
+					return nil, fmt.Errorf("failed to read file %s: %v", file.Name(), err)
+				}
+				vertex, err := ParseYSchemaToVertex(content)
+				if err != nil {
+					return nil, fmt.Errorf("failed to parse file %s: %v", file.Name(), err)
+				}
+				graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex)
+			}
+
+			if len(graphSchema["vertices"].([]map[string]any)) == 0 {
+				return nil, fmt.Errorf("no valid YAML files found in directory: %s", path)
+			}
+
+			expandedGraph, err := json.Marshal(graphSchema)
+			if err != nil {
+				return nil, fmt.Errorf("failed to marshal expanded graph: %v", err)
+			}
+
+			graph := gripql.Graph{}
+			if err := json.Unmarshal(expandedGraph, &graph); err != nil {
+				return nil, fmt.Errorf("failed to unmarshal expanded graph: %v", err)
+			}
+
+			return []*gripql.Graph{&graph}, nil
+		} else {
+			content, err := ioutil.ReadFile(path)
+			if err != nil {
+				return nil, fmt.Errorf("failed to read file %s: %v", path, err)
+			}
+			vertex, err := ParseYSchemaToVertex(content)
+			if err != nil {
+				return nil, fmt.Errorf("failed to parse file %s: %v", path, err)
+			}
+			graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex)
+			if len(graphSchema["vertices"].([]map[string]any)) == 0 {
+				return nil, fmt.Errorf("%s is not a parsable YAML schema", path)
+			}
+
+			expandedGraph, err := json.Marshal(graphSchema)
+			if err != nil {
+				return nil, fmt.Errorf("failed to marshal expanded graph: %v", err)
+			}
+
+			graph := gripql.Graph{}
+			if err := json.Unmarshal(expandedGraph, &graph); err != nil {
+				return nil, fmt.Errorf("failed to unmarshal expanded graph: %v", err)
+			}
+
+			return []*gripql.Graph{&graph}, nil
+		}
+
+	case "jSchema":
+		file, err := os.Open(path)
+		if err != nil {
+			return nil, fmt.Errorf("failed to open file: %v", err)
+		}
+		defer file.Close()
+
+		// Read the entire file content
+		bytes, err := ioutil.ReadAll(file)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read file: %v", err)
+		}
+		graphs, err = ParseJSchema(bytes, graphName)
+	default:
+		err = fmt.Errorf("unknown file format: %s", format)
+	}
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse graph at path %s: \n%v", path, err)
+	}
+	return graphs, nil
+}
+
+func traverseAndModify(data map[string]any, targetKey string) {
+	/* Since existing jsonschema lib doesn't like no url paths, convert refs to url basepath + resourceName*/
+	for key, value := range data {
+		if key == targetKey {
+			if strValue, ok := value.(string); ok {
+				strValue = strings.TrimSuffix(strValue, ".yaml")
+				if !(strings.HasPrefix(strValue, "http://") || strings.HasPrefix(strValue, "https://")) {
+					data[key] = "http://grip-schema.io/schema/0.0.1/" + strValue
+				}
+			}
+		}
+		switch v := value.(type) {
+		case map[string]any:
+			traverseAndModify(v, targetKey)
+		case []any:
+			for _, item := range v {
+				if nestedMap, ok := item.(map[string]any); ok {
+					traverseAndModify(nestedMap, targetKey)
+				}
+			}
+		}
+	}
+}
+
+func ParseYSchemaToVertex(bytes []byte) (map[string]any, error) {
+	var data map[string]any
+	if err := yaml.Unmarshal(bytes, &data); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal YAML: %v", err)
+	}
+	id, ok := data["$id"]
+	if !ok {
+		return nil, fmt.Errorf("missing $id field in YAML document")
+	}
+	data["id"] = "http://grip-schema.io/schema/0.0.1/" + id.(string)
+	delete(data, "$id")
+
+	traverseAndModify(data, "$ref")
+	vertex := map[string]any{
+		"data":  data,
+		"label": id.(string),
+		"gid":   "http://grip-schema.io/schema/0.0.1/" + id.(string),
+	}
+
+	return vertex, nil
+}
+
+func ParseJSchema(bytes []byte, graphName string) ([]*gripql.Graph, error) {
+	graphSchema := map[string]any{
+		"vertices": []map[string]any{},
+		"edges":    []map[string]any{},
+		"graph":    graphName,
+	}
+
+	// Parse JSON into a map
+	var data map[string]any
+	if err := json.Unmarshal(bytes, &data); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal JSON: %v", err)
+	}
+	for key, values := range data["$defs"].(map[string]any) {
+		vals := values.(map[string]any)
+		if idVal, exists := vals["$id"]; exists {
+			delete(vals, "$id")
+			vals["id"] = idVal
+		}
+
+		vertex := map[string]any{"data": values, "label": key, "gid": data["$id"].(string) + "/" + key}
+		graphSchema["vertices"] = append(graphSchema["vertices"].([]map[string]any), vertex)
+	}
+
+	expandedJSON, err := json.Marshal(graphSchema)
+	if err != nil {
+		log.Errorf("Failed to marshal expanded schema: %v", err)
+	}
+	graphs := gripql.Graph{}
+	json.Unmarshal(expandedJSON, &graphs)
+	return []*gripql.Graph{&graphs}, nil
+}
+
+// ParseYAMLGraphFile parses a graph file, which is formatted in YAML,
+// and returns a slice of graph objects.
+func ParseYAMLGraphsFile(relpath string) ([]*gripql.Graph, error) {
+	return parseGraphFile(relpath, "yaml", "")
+}
+
+// ParseJSONGraphFile parses a graph file, which is formatted in JSON,
+// and returns a slice of graph objects.
+func ParseJSONGraphsFile(relpath string) ([]*gripql.Graph, error) {
+	return parseGraphFile(relpath, "json", "")
+}
+
+func ParseJsonSchema(relpath string, graphName string) ([]*gripql.Graph, error) {
+	return parseGraphFile(relpath, "jSchema", graphName)
+}
+
+func ParseYamlSchemaPath(relpath string, graphName string) ([]*gripql.Graph, error) {
+	return parseGraphFile(relpath, "ySchema", graphName)
+}
+
+// GraphToYAMLString returns a graph formatted as a YAML string
+func GraphToYAMLString(graph *gripql.Graph) (string, error) {
+	out, err := protojson.Marshal(graph)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal graph: %v", err)
+	}
+	sb, err := yaml.JSONToYAML(out)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal graph: %v", err)
+	}
+	return string(sb), nil
+}
+
+// GraphToJSONString returns a graph formatted as a JSON string
+func GraphToJSONString(graph *gripql.Graph) (string, error) {
+	m := protojson.MarshalOptions{
+		UseEnumNumbers:  false,
+		EmitUnpopulated: false,
+		Indent:          "  ",
+		UseProtoNames:   false,
+	}
+	txt := m.Format(graph)
+	return txt, nil
+}
+
+func GraphMapToProto(data map[string]interface{}) (*gripql.Graph, error) {
+	part, err := json.Marshal(data)
+	if err != nil {
+		return nil, err
+	}
+	g := &gripql.Graph{}
+	err = protojson.Unmarshal(part, g)
+	if err != nil {
+		return nil, err
+	}
+	return g, nil
+}
diff --git a/gripql/graph_test.go b/schema/graph_test.go
similarity index 99%
rename from gripql/graph_test.go
rename to schema/graph_test.go
index bf7c2eef..bb828762 100644
--- a/gripql/graph_test.go
+++ b/schema/graph_test.go
@@ -1,4 +1,4 @@
-package gripql
+package schema
 
 import (
 	"reflect"
diff --git a/gripql/schema/scan.go b/schema/scan.go
similarity index 100%
rename from gripql/schema/scan.go
rename to schema/scan.go
diff --git a/server/api.go b/server/api.go
index 758d26a7..1ecc8e33 100644
--- a/server/api.go
+++ b/server/api.go
@@ -10,10 +10,15 @@ import (
 	"github.com/bmeg/grip/gripper"
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
+	"github.com/bmeg/grip/schema"
 	"github.com/bmeg/grip/util"
+	"github.com/bmeg/jsonschema/v5"
+	"github.com/bmeg/jsonschemagraph/graph"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/types/known/structpb"
 )
 
 // Traversal parses a traversal request and streams the results back
@@ -218,6 +223,111 @@ func (server *GripServer) addEdge(ctx context.Context, elem *gripql.GraphElement
 	return &gripql.EditResult{Id: edge.Gid}, nil
 }
 
+func (server *GripServer) BulkAddRaw(stream gripql.Edit_BulkAddRawServer) error {
+	var insertCount int32
+	wg := &sync.WaitGroup{}
+	var populated bool
+	var sch *gripql.Graph
+	out := &graph.GraphSchema{Classes: map[string]*jsonschema.Schema{}, Compiler: nil}
+	elementStream := make(chan *gdbi.GraphElement)
+	var retErrs []string
+	for {
+		var err error
+		class, err := stream.Recv()
+		if err == io.EOF {
+			break
+		}
+
+		if !populated {
+			sch, err = server.getGraph(class.Graph + "__schema__")
+			if err != nil {
+				log.Errorf("Error loading schemas: %v", err)
+				retErrs = append(retErrs, err.Error())
+				break
+			}
+
+			out, err = server.LoadSchemas(sch, out)
+			if err != nil {
+				log.Errorf("Error loading schemas: %v", err)
+				retErrs = append(retErrs, err.Error())
+				break
+			}
+			populated = true
+		}
+
+		gdb, err := server.getGraphDB(class.Graph)
+		if err != nil {
+			retErrs = append(retErrs, err.Error())
+			break
+		}
+
+		graph, err := gdb.Graph(class.Graph)
+		if err != nil {
+			log.WithFields(log.Fields{"error": err}).Error("BulkAddRaw: error")
+			retErrs = append(retErrs, err.Error())
+			continue
+		}
+
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			err := graph.BulkAdd(elementStream)
+			if err != nil {
+				log.WithFields(log.Fields{"graph": class.Graph, "error": err}).Error("BulkAddRaw: error")
+				retErrs = append(retErrs, err.Error())
+			}
+		}()
+
+		classData := class.Data.AsMap()
+
+		// to generate grip data, need to know what type the data is.
+		resourceType, ok := classData["resourceType"].(string)
+		if !ok {
+			log.WithFields(log.Fields{"error": fmt.Errorf("row %s does not have required field resourceType", classData)}).Error("BulkAddRaw: streaming error")
+			retErrs = append(retErrs, fmt.Sprintf("row %s does not have required field resourceType", classData))
+			continue
+		}
+
+		args := class.ExtraArgs.AsMap()
+
+		result, err := out.Generate(resourceType, classData, false, args)
+		if err != nil {
+			log.WithFields(log.Fields{"error": err}).Errorf("BulkAddRaw: validation error for %s: %s", resourceType, classData)
+			retErrs = append(retErrs, err.Error())
+			continue
+		}
+
+		for _, element := range result {
+			if element.Vertex != nil {
+				elementStream <- &gdbi.GraphElement{
+					Vertex: &gdbi.Vertex{
+						ID:    element.Vertex.Gid,
+						Data:  element.Vertex.Data.AsMap(),
+						Label: element.Vertex.Label,
+					},
+					Graph: class.Graph,
+				}
+			} else {
+				elementStream <- &gdbi.GraphElement{
+					Edge: &gdbi.Edge{
+						ID:    element.Edge.Gid,
+						Label: element.Edge.Label,
+						From:  element.Edge.From,
+						To:    element.Edge.To,
+						Data:  element.Edge.Data.AsMap(),
+					},
+					Graph: class.Graph,
+				}
+			}
+			insertCount++
+		}
+
+	}
+	close(elementStream)
+	wg.Wait()
+	return stream.SendAndClose(&gripql.BulkJsonEditResult{InsertCount: insertCount, Errors: retErrs})
+}
+
 // BulkAdd a stream of inputs and loads them into the graph
 func (server *GripServer) BulkAdd(stream gripql.Edit_BulkAddServer) error {
 	var graphName string
@@ -282,7 +392,7 @@ func (server *GripServer) BulkAdd(stream gripql.Edit_BulkAddServer) error {
 			err := element.Vertex.Validate()
 			if err != nil {
 				errorCount++
-				log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: vertex validation failed")
+				log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: vertex validation failed for vertex: %#v", element.Vertex)
 			} else {
 				insertCount++
 				elementStream <- gdbi.NewGraphElement(element)
@@ -296,7 +406,7 @@ func (server *GripServer) BulkAdd(stream gripql.Edit_BulkAddServer) error {
 			err := element.Edge.Validate()
 			if err != nil {
 				errorCount++
-				log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: edge validation failed")
+				log.WithFields(log.Fields{"graph": element.Graph, "error": err}).Errorf("BulkAdd: edge validation failed for edge: %#v", element.Edge)
 			} else {
 				insertCount++
 				elementStream <- gdbi.NewGraphElement(element)
@@ -489,10 +599,27 @@ func (server *GripServer) AddSchema(ctx context.Context, req *gripql.Graph) (*gr
 	if err != nil {
 		return nil, fmt.Errorf("failed to store new schema: %v", err)
 	}
-	server.schemas[req.Graph] = req
+
+	server.schemas[req.Graph] = server.getSchema(req.Graph + "__schema__")
 	return &gripql.EditResult{Id: req.Graph}, nil
 }
 
+// AddJsonSchema adds a jsonschema to grip as a graph
+func (server *GripServer) AddJsonSchema(ctx context.Context, rawjson *gripql.RawJson) (*gripql.EditResult, error) {
+	bytes, err := protojson.Marshal(rawjson.Data)
+	if err != nil {
+		fmt.Printf("Failed to marshal data to bytes: %v\n", err)
+		return nil, err
+	}
+	req, err := schema.ParseJSchema(bytes, rawjson.Graph)
+	if err != nil {
+		fmt.Errorf("Failed to parse schema data: %v\n", err)
+		return nil, err
+	}
+	res, err := server.AddSchema(ctx, req[0])
+	return res, err
+}
+
 // GetMapping returns the schema of a specific graph in the database
 func (server *GripServer) GetMapping(ctx context.Context, elem *gripql.GraphID) (*gripql.Graph, error) {
 	if !server.graphExists(elem.Graph) {
@@ -528,3 +655,29 @@ func (server *GripServer) graphExists(graphName string) bool {
 	}
 	return found
 }
+
+func (server *GripServer) getSchema(graphName string) *gripql.Graph {
+	gdb, err := server.getGraphDB(graphName)
+	if err != nil {
+		return &gripql.Graph{}
+	}
+	gripGraph := gripql.Graph{}
+	for _, graph := range gdb.ListGraphs() {
+		if graph == graphName {
+			found_graph, err := gdb.Graph(graph)
+			if err != nil {
+				return &gripql.Graph{}
+			}
+			for elem := range found_graph.GetVertexList(context.Background(), true) {
+				graphelem := elem.Get()
+				data, _ := structpb.NewStruct(graphelem.Data)
+				gripGraph.Vertices = append(gripGraph.Vertices, &gripql.Vertex{
+					Gid:   graphelem.ID,
+					Label: graphelem.Label,
+					Data:  data,
+				})
+			}
+		}
+	}
+	return &gripGraph
+}
diff --git a/server/metagraphs.go b/server/metagraphs.go
index 856189cf..336cbb76 100644
--- a/server/metagraphs.go
+++ b/server/metagraphs.go
@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"strings"
 	"time"
@@ -11,6 +12,9 @@ import (
 	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/util/rpc"
+	"github.com/bmeg/jsonschema/v5"
+	"github.com/bmeg/jsonschemagraph/compile"
+	"github.com/bmeg/jsonschemagraph/graph"
 )
 
 var schemaSuffix = "__schema__"
@@ -137,16 +141,12 @@ func (server *GripServer) addFullGraph(ctx context.Context, graphName string, sc
 	if graphName == "" {
 		return fmt.Errorf("graph name is an empty string")
 	}
-	if server.graphExists(graphName) {
-		_, err := server.DeleteGraph(ctx, &gripql.GraphID{Graph: graphName})
+	if !server.graphExists(graphName) {
+		_, err := server.AddGraph(ctx, &gripql.GraphID{Graph: graphName})
 		if err != nil {
-			return fmt.Errorf("failed to remove previous schema: %v", err)
+			return fmt.Errorf("error creating graph '%s': %v", graphName, err)
 		}
 	}
-	_, err := server.AddGraph(ctx, &gripql.GraphID{Graph: graphName})
-	if err != nil {
-		return fmt.Errorf("error creating graph '%s': %v", graphName, err)
-	}
 	for _, v := range schema.Vertices {
 		_, err := server.addVertex(ctx, &gripql.GraphElement{Graph: graphName, Vertex: v})
 		if err != nil {
@@ -161,3 +161,32 @@ func (server *GripServer) addFullGraph(ctx context.Context, graphName string, sc
 	}
 	return nil
 }
+
+func (server *GripServer) LoadSchemas(sch *gripql.Graph, out *graph.GraphSchema) (*graph.GraphSchema, error) {
+	schcompiler := jsonschema.NewCompiler()
+	schcompiler.ExtractAnnotations = true
+	schcompiler.RegisterExtension(compile.GraphExtensionTag, compile.GraphExtMeta, compile.GraphExtCompiler{})
+
+	for _, v := range sch.Vertices {
+		jsonData, err := json.Marshal(v.Data)
+		if err != nil {
+			return nil, err
+		}
+		err = schcompiler.AddResource(v.Gid, strings.NewReader(string(jsonData)))
+		if err != nil {
+			log.Error("schcompiler.AddResource err: ", err)
+			return nil, err
+		}
+	}
+	for _, v := range sch.Vertices {
+		sch, err := schcompiler.Compile(v.Gid)
+		if err != nil {
+			log.Error("schcompiler.Compile err: ", err)
+			return nil, err
+		}
+		out.Classes[v.Label] = sch
+	}
+	out.Compiler = schcompiler
+
+	return out, nil
+}
diff --git a/server/server.go b/server/server.go
index d1d915a1..5deb2942 100644
--- a/server/server.go
+++ b/server/server.go
@@ -24,7 +24,6 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	"github.com/bmeg/grip/elastic"
 	esql "github.com/bmeg/grip/existing-sql"
 	"github.com/bmeg/grip/grids"
 	"github.com/bmeg/grip/gripper"
@@ -129,8 +128,6 @@ func StartDriver(d config.DriverConfig, sources map[string]gripper.GRIPSourceCli
 		return kvgraph.NewKVGraphDB("pebble", *d.Pebble)
 	} else if d.Grids != nil {
 		return grids.NewGraphDB(*d.Grids)
-	} else if d.Elasticsearch != nil {
-		return elastic.NewGraphDB(*d.Elasticsearch)
 	} else if d.MongoDB != nil {
 		return mongo.NewGraphDB(*d.MongoDB)
 	} else if d.PSQL != nil {
diff --git a/test/elastic.yml b/test/elastic.yml
deleted file mode 100644
index a639cdd8..00000000
--- a/test/elastic.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-Default: elastic
-
-Drivers:
-  elastic:
-    Elasticsearch:
-      URL: http://localhost:19200
-      Synchronous: true
diff --git a/test/main_test.go b/test/main_test.go
index b955d49d..36a71899 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -9,7 +9,6 @@ import (
 	"testing"
 
 	"github.com/bmeg/grip/config"
-	"github.com/bmeg/grip/elastic"
 	esql "github.com/bmeg/grip/existing-sql"
 	"github.com/bmeg/grip/gdbi"
 	"github.com/bmeg/grip/grids"
@@ -132,8 +131,6 @@ func TestMain(m *testing.M) {
 		defer func() {
 			os.RemoveAll(*dbconfig.Grids)
 		}()
-	} else if dbconfig.Elasticsearch != nil {
-		gdb, err = elastic.NewGraphDB(*dbconfig.Elasticsearch)
 	} else if dbconfig.MongoDB != nil {
 		gdb, err = mongo.NewGraphDB(*dbconfig.MongoDB)
 	} else if dbconfig.PSQL != nil {
diff --git a/test/schema_graph_test.go b/test/schema_graph_test.go
index ded42105..ee45d268 100644
--- a/test/schema_graph_test.go
+++ b/test/schema_graph_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestSchema(t *testing.T) {
-	if dbname == "psql" || dbname == "existing-sql" || dbname == "elastic" {
+	if dbname == "psql" || dbname == "existing-sql" {
 		t.Skip("skipping schema test")
 	}
 
diff --git a/util/file_reader.go b/util/file_reader.go
index 820c136f..07c9678c 100644
--- a/util/file_reader.go
+++ b/util/file_reader.go
@@ -18,6 +18,7 @@ import (
 	"github.com/minio/minio-go/v7/pkg/credentials"
 
 	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/types/known/structpb"
 )
 
 func getS3Client(u *url.URL) (*minio.Client, error) {
@@ -113,6 +114,53 @@ func StreamLines(file string, chanSize int) (chan string, error) {
 	return lineChan, nil
 }
 
+func StreamRawJsonFromFile(file string, workers int, graph string, extra_args map[string]any) (chan *gripql.RawJson, error) {
+	if workers < 1 {
+		workers = 1
+	}
+	if workers > 99 {
+		workers = 99
+	}
+	lineChan, err := StreamLines(file, workers)
+	if err != nil {
+		return nil, err
+	}
+	jsonChan := make(chan *gripql.RawJson, workers)
+	var wg sync.WaitGroup
+	jum := protojson.UnmarshalOptions{DiscardUnknown: true}
+
+	for i := 0; i < workers; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for line := range lineChan {
+				rawData := &gripql.RawJson{
+					Data:      &structpb.Struct{},
+					ExtraArgs: &structpb.Struct{},
+					Graph:     graph,
+				}
+
+				rawData.ExtraArgs, err = structpb.NewStruct(extra_args)
+				if err != nil {
+					log.WithFields(log.Fields{"error": err}).Errorf("Marshalling ExtraArgs: %#v", extra_args)
+					continue
+				}
+				err = jum.Unmarshal([]byte(line), rawData.Data)
+				if err != nil {
+					log.WithFields(log.Fields{"error": err}).Errorf("Unmarshaling vertex: %s", line)
+					continue
+				}
+				jsonChan <- rawData
+			}
+		}()
+	}
+	go func() {
+		wg.Wait()
+		close(jsonChan)
+	}()
+	return jsonChan, nil
+}
+
 // StreamVerticesFromFile reads a file containing a vertex per line and
 // streams *gripql.Vertex objects out on a channel
 func StreamVerticesFromFile(file string, workers int) (chan *gripql.Vertex, error) {
diff --git a/website/config.yaml b/website/config.yaml
index 4b77f007..2f8f7616 100644
--- a/website/config.yaml
+++ b/website/config.yaml
@@ -1,4 +1,4 @@
-baseURL: https://bmeg.github.io/grip
+baseURL: https://bmeg.github.io/grip/
 canonifyURLs: true
 languageCode: en-us
 title: GRIP
diff --git a/website/content/docs.md b/website/content/docs.md
index 266eed9c..1c5f3990 100644
--- a/website/content/docs.md
+++ b/website/content/docs.md
@@ -9,14 +9,14 @@ menu:
 # Overview
 
 GRIP stands for GRaph Integration Platform. It provides a graph interface on top of a variety of existing database technologies including:
-MongoDB, Elasticsearch, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
+MongoDB, PostgreSQL, MySQL, MariaDB, Badger, and LevelDB.
 
 Properties of an GRIP graph:
 
-* Both vertices and edges in a graph can have any number of properties associated with them.
-* There are many types of vertices and edges in a graph. Two vertices may have many types of edges
+- Both vertices and edges in a graph can have any number of properties associated with them.
+- There are many types of vertices and edges in a graph. Two vertices may have many types of edges
   connecting them, thus reflecting a myriad of relationship types.
-* Edges in the graph are directed, meaning they have a source and destination.
+- Edges in the graph are directed, meaning they have a source and destination.
 
 GRIP also provides a query API for the traversing, analyzing and manipulating your graphs. Its syntax is inspired by
 [Apache TinkerPop](http://tinkerpop.apache.org/). Learn more [here](/docs/queries/getting_started) about GRIP and its
@@ -26,25 +26,25 @@ application for querying the Bio Medical Evidence Graph ([BMEG](https://bmeg.io)
 
 GRIP has three types of drivers:
 
- - *Embedded* : GRIP has built in graph storage, built using embedded databases. This allows you to quick
- set graphs for data storage and analysis, without having to configure an external database and connect it
- to GRIP. This is the default mode if GRIP is started without any configuration. The primarily driver
- is based on [Badger](https://github.com/dgraph-io/badger).
- - *Database Backends* : GRIP can utilize a number of different database backends to store graph data.
- In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same
- as the Embedded deployment. Supported systems include Mongo, Portgres SQL and Elastic Search. When deployed
- using Mongo, GRIP will translate GripQL queries into [Mongo Aggregation Pipeline queries](https://docs.mongodb.com/manual/core/aggregation-pipeline/).
-  - *Plugin Existing Resources* : This mode is designed to take advantage of existing data resources, mapping
- them into a graph framework so they can be accessed using GripQL. This mode is currently read-only.
+- _Embedded_ : GRIP has built in graph storage, built using embedded databases. This allows you to quick
+  set graphs for data storage and analysis, without having to configure an external database and connect it
+  to GRIP. This is the default mode if GRIP is started without any configuration. The primarily driver
+  is based on [Badger](https://github.com/dgraph-io/badger).
+- _Database Backends_ : GRIP can utilize a number of different database backends to store graph data.
+  In this mode, GRIP formats the database and manages the data. It provides a full Read/Write API, the same
+  as the Embedded deployment. Supported systems include Mongo, Portgres SQL. When deployed
+  using Mongo, GRIP will translate GripQL queries into [Mongo Aggregation Pipeline queries](https://docs.mongodb.com/manual/core/aggregation-pipeline/).
+- _Plugin Existing Resources_ : This mode is designed to take advantage of existing data resources, mapping
+  them into a graph framework so they can be accessed using GripQL. This mode is currently read-only.
 
 # Future Plans
 
 GRIP is still under active development and there are plans for a number of additional features. These include:
 
- - Batch queries. Ability to submit long running queries to be processed asynchronously and stored for later retrieval.
- - Query Caching.
- - Query Continuation. Ability to describe a graph query that starts off where another query ended. For example,
- from batch or cached query and to filtering or a few additional steps.
- - Optimized Plugable External Resource API. Adding additional operations, such as 'joins' or better filtering, to
- external resources would allow GRIP to better optimize queries and reduce query time.
- - Managed Plugin deployment.
+- Batch queries. Ability to submit long running queries to be processed asynchronously and stored for later retrieval.
+- Query Caching.
+- Query Continuation. Ability to describe a graph query that starts off where another query ended. For example,
+  from batch or cached query and to filtering or a few additional steps.
+- Optimized Plugable External Resource API. Adding additional operations, such as 'joins' or better filtering, to
+  external resources would allow GRIP to better optimize queries and reduce query time.
+- Managed Plugin deployment.
diff --git a/website/content/docs/databases/elastic.md b/website/content/docs/databases/elastic.md
deleted file mode 100644
index 4996fa1e..00000000
--- a/website/content/docs/databases/elastic.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: Elasticsearch
-
-menu:
-  main:
-    parent: Databases
-    weight: 1
----
-
-# Elasticsearch
-
-GRIP supports storing vertices and edges in [Elasticsearch][elastic].
-
-Config:
-
-```yaml
-Default: elastic
-
-Drivers:
-  elastic:
-    Elasticsearch:
-      URL: "http://localhost:9200"
-      DBName: "gripdb"
-      Username: ""
-      Password: ""
-```
-
-[elastic]: https://www.elastic.co/
diff --git a/website/layouts/index.html b/website/layouts/index.html
index d6be62aa..d68101e2 100644
--- a/website/layouts/index.html
+++ b/website/layouts/index.html
@@ -1,149 +1,153 @@
-
 {{ partial "head.html" . }}
 
-<div class="homepage-lead"><div class="homepage-lead-container">
-  <p>GRaph Integration Platform (GRIP)</p>
-  <a href="{{ .Site.BaseURL }}/download" class="download-button">Download</a>
-  <a href="{{ .Site.BaseURL }}/docs" class="docs-button">Documentation</a>
-</div></div>
+<div class="homepage-lead">
+    <div class="homepage-lead-container">
+        <p>GRaph Integration Platform (GRIP)</p>
+        <a href="{{ .Site.BaseURL }}download" class="download-button"
+            >Download</a
+        >
+        <a href="{{ .Site.BaseURL }}docs" class="docs-button">Documentation</a>
+    </div>
+</div>
 
 <div class="homepage">
-
-  <div class="homepage-intro">
-
-    <div class="section group">
-
+    <div class="homepage-intro">
+        <div class="section group"></div>
     </div>
 
-  </div>
+    <div class="homepage-demo">
+        <div>
+            The GRaph Integration Platform (GRIP) is a graph query engine
+            designed to span across multiple database backends. It supports
+            Mongo, SQL and has a plug in architecture to allow new resource to
+            be added.
+        </div>
 
-  <div class="homepage-demo">
-    <div>
-      The GRaph Integration Platform (GRIP) is a graph query engine designed to 
-      span across multiple database backends. It supports Mongo, SQL, ElasticSearch
-      and has a plug in architecture to allow new resource to be added.
-    </div>
+        <h1 class="demo-header" id="intro">A quick introduction</h1>
 
-    <h1 class="demo-header" id="intro">A quick introduction</h1>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Start an GRIP server</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Start an GRIP server</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip server --config grip.yml</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip server --config grip.yml</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>List all graphs</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>List all graphs</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip list</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip list</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Create a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Create a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip create example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip create example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Drop a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Drop a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip drop example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip drop example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Load data into a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Load data into a  graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip load example --edge edges.txt --vertex vertices.txt</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip load example --edge edges.txt --vertex vertices.txt</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Query a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Query a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip query example 'V().hasLabel("users")'</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip query example 'V().hasLabel("users")'</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Get vertex/edge counts for a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Get vertex/edge counts for a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip info example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip info example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Get the schema for a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Get the schema for a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip schema get example</code></pre>
+            </div>
         </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip schema get example</code></pre>
-        </div>
-      </div>
+        <div class="section group">
+            <div class="col span_3_of_12">
+                <h1>Dump vertices/edges from a graph</h1>
+            </div>
 
-      <div class="section group">
-        <div class="col span_3_of_12">
-          <h1>Dump vertices/edges from a graph</h1>
+            <div class="col span_9_of_12">
+                <pre><code class="language-shell">$ grip dump example --vertex</code></pre>
+            </div>
         </div>
+    </div>
 
-        <div class="col span_9_of_12">
-          <pre><code class="language-shell">$ grip dump example --vertex</code></pre>
+    <div class="homepage-more">
+        <div class="section group">
+            <div class="col span_4_of_12">
+                <h3>Drop in for a chat.</h3>
+                <p>
+                    Join the
+                    <a href="https://gitter.im/bmeg/grip">Gitter channel</a>.
+                </p>
+            </div>
+
+            <div class="col span_4_of_12">
+                <h3>Get the code.</h3>
+                <p>
+                    Head over to
+                    <a href="https://github.com/bmeg/grip">GitHub</a> and dig
+                    in.
+                </p>
+            </div>
+
+            <div class="col span_4_of_12">
+                <h3>Give feedback.</h3>
+                <p>
+                    <a href="https://github.com/bmeg/grip/issues"
+                        >Let us know</a
+                    >
+                    what you think.
+                </p>
+            </div>
         </div>
-      </div>
-
-  </div>
-
-  <div class="homepage-more">
-
-    <div class="section group">
-
-      <div class="col span_4_of_12">
-        <h3>Drop in for a chat.</h3>
-        <p>Join the <a href="https://gitter.im/bmeg/grip">Gitter channel</a>.</p>
-      </div>
-
-      <div class="col span_4_of_12">
-        <h3>Get the code.</h3>
-        <p>Head over to <a href="https://github.com/bmeg/grip">GitHub</a> and dig in.</p>
-      </div>
-
-      <div class="col span_4_of_12">
-        <h3>Give feedback.</h3>
-        <p>
-          <a href="https://github.com/bmeg/grip/issues">Let us know</a> what you think.</p>
-      </div>
-
     </div>
 
-  </div>
-
-  <div class="homepage-footer"></div>
-
+    <div class="homepage-footer"></div>
 </div>
 
 {{ partial "tail.html" . }}
diff --git a/website/layouts/partials/head.html b/website/layouts/partials/head.html
index 0db56e5a..8ab9b152 100644
--- a/website/layouts/partials/head.html
+++ b/website/layouts/partials/head.html
@@ -14,18 +14,18 @@
   {{ end }}
 
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/poole.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/darcula.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/syntax.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/theme.css">
-  <link rel="stylesheet" href="{{ .Site.BaseURL }}/css/funnel.css">
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/poole.css">
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/darcula.css">
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/syntax.css">
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/theme.css">
+  <link rel="stylesheet" href="{{ .Site.BaseURL }}css/funnel.css">
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700">
 
   <!-- Icons -->
   <link rel="apple-touch-icon-precomposed" sizes="144x144" href="/apple-touch-icon-144-precomposed.png">
   <link rel="shortcut icon" href="/favicon.png">
 
-  <script src="{{ .Site.BaseURL }}/js/highlight.pack.js"></script>
+  <script src="{{ .Site.BaseURL }}js/highlight.pack.js"></script>
   <script>hljs.initHighlightingOnLoad();</script>
 
 </head>
@@ -37,8 +37,8 @@
         <a href="{{ .Site.BaseURL }}"><h1>GRIP</h1></a>
       </div>
       <ul class="global-header-nav">
-          <li><a href="{{ .Site.BaseURL }}/download//">Download</a></li>
-          <li><a href="{{ .Site.BaseURL }}/docs/">Docs</a></li>
+          <li><a href="{{ .Site.BaseURL }}download//">Download</a></li>
+          <li><a href="{{ .Site.BaseURL }}docs/">Docs</a></li>
           <li><a href="https://github.com/bmeg/grip">GitHub</a></li>
           <li><a href="https://gitter.im/bmeg/grip">Chat</a></li>
         </ul>